From: Paul Eggleton <paul.eggle...@linux.intel.com>

In the busybox package prerm we set up some temporary links and modify
PATH so that certain utilities are provided for the purpose of running
update-alternatives; if grep is not among these then you get errors when
removing busybox, so add a temporary link for grep as well.

Signed-off-by: Paul Eggleton <paul.eggle...@linux.intel.com>

Resorted the link list.

Signed-off-by: Saul Wold <s...@linux.intel.com>
---
 meta/recipes-core/busybox/busybox.inc       |   11 ++++++-----
 meta/recipes-core/busybox/busybox_1.18.5.bb |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index acd635b..ff31bb7 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -259,17 +259,18 @@ pkg_prerm_${PN} () {
        # for syslog, httpd and/or udhcpd will fail if there is no other 
package providing sh
        tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
        ln -s /bin/busybox $tmpdir/[
-       ln -s /bin/busybox $tmpdir/test
-       ln -s /bin/busybox $tmpdir/head
-       ln -s /bin/busybox $tmpdir/sh
        ln -s /bin/busybox $tmpdir/basename
+       ln -s /bin/busybox $tmpdir/dirname
        ln -s /bin/busybox $tmpdir/echo
-       ln -s /bin/busybox $tmpdir/mv
+       ln -s /bin/busybox $tmpdir/grep
+       ln -s /bin/busybox $tmpdir/head
        ln -s /bin/busybox $tmpdir/ln
-       ln -s /bin/busybox $tmpdir/dirname
+       ln -s /bin/busybox $tmpdir/mv
        ln -s /bin/busybox $tmpdir/rm
        ln -s /bin/busybox $tmpdir/sed
+       ln -s /bin/busybox $tmpdir/sh
        ln -s /bin/busybox $tmpdir/sort
+       ln -s /bin/busybox $tmpdir/test
        export PATH=$PATH:$tmpdir
 
        while read link
diff --git a/meta/recipes-core/busybox/busybox_1.18.5.bb 
b/meta/recipes-core/busybox/busybox_1.18.5.bb
index bdafb31..17d583e 100644
--- a/meta/recipes-core/busybox/busybox_1.18.5.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.5.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball 
\
            file://udhcpscript.patch \
-- 
1.7.6.4


_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to