summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-02 11:41:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-04 17:05:31 +0000
commit3b856e1cdf38705f1ae79df09e7e6f388673a683 (patch)
tree6cdcd2e18d31b75fe425a15c16b79b2935bdf895 /meta
parente48e2f2335b1fca89df30d1f7393c9bd1f28f40f (diff)
downloadpoky-3b856e1cdf38705f1ae79df09e7e6f388673a683.tar.gz
bash: Ensure we fully reautoconf the recipes so site data is used
This ensures bug 487 (missing job control functionality) really gets fixed. [YOCTO #487] (From OE-Core rev: 08b78066bd5a9ff2819a42eb4263ee0a78cddb97) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/bash/bash.inc9
-rw-r--r--meta/recipes-extended/bash/bash_3.2.48.bb11
-rw-r--r--meta/recipes-extended/bash/bash_4.2.bb2
3 files changed, 14 insertions, 8 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index d55e517de1..876be1e42d 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -22,9 +22,12 @@ ALTERNATIVE_PATH = "${base_bindir}/bash"
22ALTERNATIVE_LINK = "${base_bindir}/sh" 22ALTERNATIVE_LINK = "${base_bindir}/sh"
23ALTERNATIVE_PRIORITY = "100" 23ALTERNATIVE_PRIORITY = "100"
24 24
25do_configure () { 25export AUTOHEADER = "true"
26 gnu-configize 26
27 oe_runconf 27do_configure_prepend () {
28 if [ ! -e acinclude.m4 ]; then
29 cat aclocal.m4 > acinclude.m4
30 fi
28} 31}
29 32
30pkg_postinst_${PN} () { 33pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb
index 1520c4e6ba..f2ba5721c6 100644
--- a/meta/recipes-extended/bash/bash_3.2.48.bb
+++ b/meta/recipes-extended/bash/bash_3.2.48.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" 6LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a"
7DEPENDS = "ncurses" 7DEPENDS = "ncurses"
8 8
9PR = "r7" 9PR = "r8"
10 10
11SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
12 ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0 \ 12 ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0 \
@@ -23,9 +23,12 @@ sbindir = "/sbin"
23EXTRA_OECONF = "--with-ncurses" 23EXTRA_OECONF = "--with-ncurses"
24export CC_FOR_BUILD = "${BUILD_CC}" 24export CC_FOR_BUILD = "${BUILD_CC}"
25 25
26do_configure () { 26export AUTOHEADER = "true"
27 gnu-configize 27
28 oe_runconf 28do_configure_prepend () {
29 if [ ! -e acinclude.m4 ]; then
30 cat aclocal.m4 > acinclude.m4
31 fi
29} 32}
30 33
31pkg_postinst_${PN} () { 34pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index a0f5e4ef96..80709183cd 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 = "r0" 3PR = "r1"
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 \