Patchwork [2/2] busybox: add grep to temporary links during uninstall

login
register
mail settings
Submitter Paul Eggleton
Date Nov. 9, 2011, 12:05 p.m.
Message ID <65800b1433cf95084cb7541fbc14419086234470.1320839130.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/14621/
State Accepted
Commit 013eca09c863862cc6b7ee3bc22923bf8fb42956
Headers show

Comments

Paul Eggleton - Nov. 9, 2011, 12:05 p.m.
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>
---
 meta/recipes-core/busybox/busybox.inc       |    1 +
 meta/recipes-core/busybox/busybox_1.18.5.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
Paul Menzel - Nov. 9, 2011, 7:28 p.m.
Am Mittwoch, den 09.11.2011, 12:05 +0000 schrieb Paul Eggleton:
> 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>
> ---
>  meta/recipes-core/busybox/busybox.inc       |    1 +
>  meta/recipes-core/busybox/busybox_1.18.5.bb |    2 +-
>  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

Should it be sorted?

[…]


Thanks,

Paul
Paul Eggleton - Nov. 10, 2011, 10:07 a.m.
On Wednesday 09 November 2011 20:28:07 Paul Menzel wrote:
> Should it be sorted?

Possibly, but that ought to be done in a separate patch.

Cheers,
Paul

Patch

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 \