summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-07-20 14:12:09 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 14:40:44 +0100
commit4113211345f967957c9c8bfb5060556566f401e9 (patch)
treee04553bb5074b140610633704cf1e91923298077
parentd9ad9bc3df28d6895f868fbba7033a13b2164668 (diff)
downloadpoky-4113211345f967957c9c8bfb5060556566f401e9.tar.gz
bash: fix warning about bashbug reference /usr/bin when installed in /bin
Change the installation process so we have bashbug in ${bindir} and bash at ${base_bindir}. (From OE-Core rev: f2dc23cf886de95040080c4398a3320c211b65fa) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bash/bash.inc11
-rw-r--r--meta/recipes-extended/bash/bash_4.2.bb2
2 files changed, 9 insertions, 4 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index ff9b0ce999..3684191d03 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -11,9 +11,6 @@ inherit autotools gettext update-alternatives
11 11
12PARALLEL_MAKE = "" 12PARALLEL_MAKE = ""
13 13
14bindir = "/bin"
15sbindir = "/sbin"
16
17EXTRA_OECONF = "--enable-job-control" 14EXTRA_OECONF = "--enable-job-control"
18export CC_FOR_BUILD = "${BUILD_CC}" 15export CC_FOR_BUILD = "${BUILD_CC}"
19 16
@@ -30,6 +27,14 @@ do_configure_prepend () {
30 fi 27 fi
31} 28}
32 29
30do_install_append () {
31 # Move /usr/bin/bash to /bin/bash, if need
32 if [ "${base_bindir}" != "${bindir}" ]; then
33 mkdir -p ${D}${base_bindir}
34 mv ${D}${bindir}/bash ${D}${base_bindir}
35 fi
36}
37
33pkg_postinst_${PN} () { 38pkg_postinst_${PN} () {
34 touch $D${sysconfdir}/shells 39 touch $D${sysconfdir}/shells
35 grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells 40 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 e96709a59c..50f2ff64b8 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -1,6 +1,6 @@
1require bash.inc 1require bash.inc
2 2
3PR = "r2" 3PR = "r4"
4 4
5SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \ 5SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
6 ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \ 6 ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \