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 <[email protected]>
---
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!
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
