[OE-core] [PATCH] bash: fix warning about bashbug reference /usr/bin when installed in /bin
Otavio Salvador
otavio at ossystems.com.br
Thu Jul 19 15:16:38 UTC 2012
We change the installation process so we have bashbug in ${bindir} and
bash at ${base_bindir}; we also build tested it many times in a 8 CPU
machine and had no problem building it in parallel so we dropped
PARALLEL_MAKE override.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
meta/recipes-extended/bash/bash.inc | 13 ++++++++-----
meta/recipes-extended/bash/bash_4.2.bb | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index ff9b0ce..a7f5f8f 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -9,11 +9,6 @@ DEPENDS = "ncurses bison-native"
inherit autotools gettext update-alternatives
-PARALLEL_MAKE = ""
-
-bindir = "/bin"
-sbindir = "/sbin"
-
EXTRA_OECONF = "--enable-job-control"
export CC_FOR_BUILD = "${BUILD_CC}"
@@ -30,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 e96709a..a28279e 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 = "r2"
+PR = "r3"
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 \
--
1.7.2.5
More information about the Openembedded-core
mailing list