summaryrefslogtreecommitdiff
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-09 14:58:14 +0000
commit013eca09c863862cc6b7ee3bc22923bf8fb42956 (patch)
tree6120991828ec175be6f4b0e0827c28f9a74b3945 /meta
parent1d3f37dc9a43ba6d6beb7b4530c077f239032b99 (diff)
downloadopenembedded-core-013eca09c863862cc6b7ee3bc22923bf8fb42956.tar.gz
openembedded-core-013eca09c863862cc6b7ee3bc22923bf8fb42956.tar.bz2
openembedded-core-013eca09c863862cc6b7ee3bc22923bf8fb42956.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
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 acd635b1e3..f8fee51725 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 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 @@
require busybox.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \