aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/busybox/APKBUILD2
-rw-r--r--main/busybox/busybox.post-install3
-rw-r--r--[l---------]main/busybox/busybox.post-upgrade10
3 files changed, 12 insertions, 3 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 4c11b21590..6d27a88b2b 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.18.5
-pkgrel=0
+pkgrel=1
_bbsuidver=0.6
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
diff --git a/main/busybox/busybox.post-install b/main/busybox/busybox.post-install
index 8baed730c6..a986b2f766 100644
--- a/main/busybox/busybox.post-install
+++ b/main/busybox/busybox.post-install
@@ -1,3 +1,4 @@
#!/bin/sh
-/bin/busybox --install -s
+# We need the symlinks early
+exec /bin/busybox --install -s
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index 1f4b450e5e..c55561cc11 120000..100644
--- a/main/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
@@ -1 +1,9 @@
-busybox.post-install \ No newline at end of file
+#!/bin/sh
+
+# /bin/install has moved to /usr/bin/install, but we need remove old link
+if [ -L /bin/install ] && [ "$(readlink /bin/install)" = "/bin/busybox" ]; then
+ rm /bin/install
+fi
+
+# We need the symlinks early
+exec /bin/busybox --install -s