summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-09 11:33:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:37:10 +0000
commitb81caca23126b7b20535c1993a3972085e65e59b (patch)
treea3bc44f97924cf70838e6effa9414b6ecafac429
parent7b645cac3f7e89c20918e83d61352ccc5f8b63be (diff)
downloadpoky-b81caca23126b7b20535c1993a3972085e65e59b.tar.gz
busybox: add grep to temporary links during uninstall
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. (From OE-Core rev: 013eca09c863862cc6b7ee3bc22923bf8fb42956) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc1
-rw-r--r--meta/recipes-core/busybox/busybox_1.18.5.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index acd635b1e3..f8fee51725 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -270,6 +270,7 @@ pkg_prerm_${PN} () {
270 ln -s /bin/busybox $tmpdir/rm 270 ln -s /bin/busybox $tmpdir/rm
271 ln -s /bin/busybox $tmpdir/sed 271 ln -s /bin/busybox $tmpdir/sed
272 ln -s /bin/busybox $tmpdir/sort 272 ln -s /bin/busybox $tmpdir/sort
273 ln -s /bin/busybox $tmpdir/grep
273 export PATH=$PATH:$tmpdir 274 export PATH=$PATH:$tmpdir
274 275
275 while read link 276 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 bdafb316a5..17d583e6e3 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 @@
1require busybox.inc 1require busybox.inc
2PR = "r1" 2PR = "r2"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \