summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-05-27 07:20:16 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-05-27 07:22:12 (EDT)
commitfd935fcebe18a42dad8f9e9be3a09c829a029ae1 (patch)
tree8ffc93fc59d7fefc561eac4c5c008bfafe19ac20
parent11218e9a094cc4768ae777430acf916f6b0a85ef (diff)
Manage /usr/bin/ar with update-alternatives.
-rwxr-xr-xbuild1
-rwxr-xr-xbusybox.pkg/postinst5
-rwxr-xr-xbusybox.pkg/prerm5
-rw-r--r--changelog1
4 files changed, 12 insertions, 0 deletions
diff --git a/build b/build
index 9176036..a6f858d 100755
--- a/build
+++ b/build
@@ -13,4 +13,5 @@ install:
oh-fixperms
oh-strip
chmod u+s dest/bin/busybox
+ mv dest/usr/bin/ar dest/usr/bin/ar.busybox
oh-installfiles
diff --git a/busybox.pkg/postinst b/busybox.pkg/postinst
new file mode 100755
index 0000000..829a73d
--- /dev/null
+++ b/busybox.pkg/postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "x${1}" = 'xconfigure' ]; then
+ update-alternatives --install /usr/bin/ar ar /usr/bin/ar.busybox 10
+fi
diff --git a/busybox.pkg/prerm b/busybox.pkg/prerm
new file mode 100755
index 0000000..7f466ae
--- /dev/null
+++ b/busybox.pkg/prerm
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ "${1}" = remove ]; then
+ update-alternatives --remove ar /usr/bin/ar.busybox
+fi
diff --git a/changelog b/changelog
index d2d8bd7..7beefb1 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ busybox (1.21.0-1) trunk
* Build-Depend on config-busybox-${Host-Plat}.
* Add "source" target to download and verify source.
* Cherry pick patch to install man applet in /usr/bin, not /sbin.
+ * Manage /usr/bin/ar with update-alternatives.
* Add self to maintainers.
-- "P. J. McDermott" <pjm@nac.net> Mon, 27 May 2013 06:22:21 -0400