main/busybox: fix for sort, don't depmod on kernel removal

2 files changed, 8 insertions, 2 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index c0f40a95e2..d4e9648953 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.17.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license="GPL-2"
@@ -10,6 +10,7 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="$pkgname-static"
 triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
+        http://busybox.net/downloads/fixes-1.17.3/busybox-1.17.3-sort.patch
         $pkgname-1.11.1-bb.patch
         busyboxconfig"
 
@@ -68,5 +69,6 @@ static() {
 }
 
 md5sums="a2ce1a951571da8c6e0eaf75b1acef60  busybox-1.17.3.tar.bz2
+6d9c722fdbefda5ed408da63dc6bbefe  busybox-1.17.3-sort.patch
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
 403e0b9fe99a7a18c5b9ae91283a5f9a  busyboxconfig"
diff --git a/main/busybox/busybox.trigger b/main/busybox/busybox.trigger
index 8bdef2ba56..2f69f76ceb 100644
--- a/main/busybox/busybox.trigger
+++ b/main/busybox/busybox.trigger
@@ -4,7 +4,11 @@ do_bb_install=
 
 for i in "$@"; do
         case "$i" in
-                /lib/modules/*) /bin/busybox depmod ${i#/lib/modules/};;
+                /lib/modules/*)
+                        if [ -d "$i" ]; then
+                                /bin/busybox depmod ${i#/lib/modules/}
+                        fi
+                        ;;
                 *) do_bb_install=yes;;
         esac
 done