From patchwork Fri Jul 20 17:12:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] bash: fix warning about bashbug reference /usr/bin when installed in /bin Date: Fri, 20 Jul 2012 17:12:09 -0000 From: Otavio Salvador X-Patchwork-Id: 32747 Message-Id: <1342804329-5791-2-git-send-email-otavio@ossystems.com.br> To: openembedded-core@lists.openembedded.org Change the installation process so we have bashbug in ${bindir} and bash at ${base_bindir}. Signed-off-by: Otavio Salvador --- 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 \