diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-24 09:10:56 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-24 09:10:56 +0000 |
commit | 060598965503ba0f0a1e818f0251bff2e01cac1d (patch) | |
tree | cc11b617fed610070c0acd2ac2b61b0b87824e1f | |
parent | 5245d5bdffdee245ab1bc626b5fc73783d86c8d5 (diff) | |
download | alpine_aports-060598965503ba0f0a1e818f0251bff2e01cac1d.tar.bz2 alpine_aports-060598965503ba0f0a1e818f0251bff2e01cac1d.tar.xz alpine_aports-060598965503ba0f0a1e818f0251bff2e01cac1d.zip |
main/busybox: remove old /bin/install symlink when upgrading
We have moved /bin/install to /usr/bin/install. The old symlink
should go away when upgrading and trigger script will not do it.
So we do it in post-upgrade
-rw-r--r-- | main/busybox/APKBUILD | 2 | ||||
-rw-r--r-- | main/busybox/busybox.post-install | 3 | ||||
-rw-r--r--[l---------] | main/busybox/busybox.post-upgrade | 10 |
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 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=busybox | 2 | pkgname=busybox |
3 | pkgver=1.18.5 | 3 | pkgver=1.18.5 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | _bbsuidver=0.6 | 5 | _bbsuidver=0.6 |
6 | pkgdesc="Size optimized toolbox of many common UNIX utilities" | 6 | pkgdesc="Size optimized toolbox of many common UNIX utilities" |
7 | url=http://busybox.net | 7 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | /bin/busybox --install -s | 3 | # We need the symlinks early |
4 | 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 @@ | |||
1 | busybox.post-install \ No newline at end of file | 1 | #!/bin/sh |
2 | |||
3 | # /bin/install has moved to /usr/bin/install, but we need remove old link | ||
4 | if [ -L /bin/install ] && [ "$(readlink /bin/install)" = "/bin/busybox" ]; then | ||
5 | rm /bin/install | ||
6 | fi | ||
7 | |||
8 | # We need the symlinks early | ||
9 | exec /bin/busybox --install -s | ||