[CONSOLIDATED,PULL,05/28] bash: fix warning about bashbug reference /usr/bin when installed in /bin
Submitted by Saul Wold on July 25, 2012, 7:18 a.m.
|
Patch ID: 32975
Details
Commit Message
@@ -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
@@ -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 \