summaryrefslogtreecommitdiffstats
path: root/meta
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 /meta
parent7b645cac3f7e89c20918e83d61352ccc5f8b63be (diff)
downloadast2050-yocto-poky-b81caca23126b7b20535c1993a3972085e65e59b.zip
ast2050-yocto-poky-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>
Diffstat (limited to 'meta')
-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 acd635b..f8fee51 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -270,6 +270,7 @@ pkg_prerm_${PN} () {
ln -s /bin/busybox $tmpdir/rm
ln -s /bin/busybox $tmpdir/sed
ln -s /bin/busybox $tmpdir/sort
+ ln -s /bin/busybox $tmpdir/grep
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 \
OpenPOWER on IntegriCloud