Patchwork [2/2] bash: fix warning about bashbug reference /usr/bin when installed in /bin

login
register
mail settings
Submitter Otavio Salvador
Date July 20, 2012, 5:12 p.m.
Message ID <1342804329-5791-2-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/32747/
State New
Headers show

Comments

Otavio Salvador - July 20, 2012, 5:12 p.m.
Change the installation process so we have bashbug in ${bindir} and
bash at ${base_bindir}.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-extended/bash/bash.inc    |   11 ++++++++---
 meta/recipes-extended/bash/bash_4.2.bb |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)
Saul Wold - July 26, 2012, 7:05 p.m.
On 07/20/2012 10:12 AM, Otavio Salvador wrote:
> Change the installation process so we have bashbug in ${bindir} and
> bash at ${base_bindir}.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   meta/recipes-extended/bash/bash.inc    |   11 ++++++++---
>   meta/recipes-extended/bash/bash_4.2.bb |    2 +-
>   2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
> index 6d7e930..a7f5f8f 100644
> --- a/meta/recipes-extended/bash/bash.inc
> +++ b/meta/recipes-extended/bash/bash.inc
> @@ -9,9 +9,6 @@ DEPENDS = "ncurses bison-native"
>
>   inherit autotools gettext update-alternatives
>
> -bindir = "/bin"
> -sbindir = "/sbin"
> -
>   EXTRA_OECONF = "--enable-job-control"
>   export CC_FOR_BUILD = "${BUILD_CC}"
>
> @@ -28,6 +25,14 @@ do_configure_prepend () {
>   	fi
>   }
>
> +do_install_append () {
> +	# Move /usr/bin/bash to /bin/bash, if need
> +	if [ "${base_bindir}" != "${bindir}" ]; then
> +		mkdir -p ${D}${base_bindir}
> +		mv ${D}${bindir}/bash ${D}${base_bindir}
> +	fi
> +}
> +
>   pkg_postinst_${PN} () {
>   	touch $D${sysconfdir}/shells
>   	grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
> diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
> index a28279e..50f2ff6 100644
> --- a/meta/recipes-extended/bash/bash_4.2.bb
> +++ b/meta/recipes-extended/bash/bash_4.2.bb
> @@ -1,6 +1,6 @@
>   require bash.inc
>
> -PR = "r3"
> +PR = "r4"
>
>   SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
>              ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \
>

Took this patch into OE-Core, the parallel build is still failing.

Thanks
	Sau!

Patch

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 6d7e930..a7f5f8f 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -9,9 +9,6 @@  DEPENDS = "ncurses bison-native"
 
 inherit autotools gettext update-alternatives
 
-bindir = "/bin"
-sbindir = "/sbin"
-
 EXTRA_OECONF = "--enable-job-control"
 export CC_FOR_BUILD = "${BUILD_CC}"
 
@@ -28,6 +25,14 @@  do_configure_prepend () {
 	fi
 }
 
+do_install_append () {
+	# Move /usr/bin/bash to /bin/bash, if need
+	if [ "${base_bindir}" != "${bindir}" ]; then
+		mkdir -p ${D}${base_bindir}
+		mv ${D}${bindir}/bash ${D}${base_bindir}
+	fi
+}
+
 pkg_postinst_${PN} () {
 	touch $D${sysconfdir}/shells
 	grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index a28279e..50f2ff6 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -1,6 +1,6 @@ 
 require bash.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
            ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \