diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-02 11:41:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:38:10 +0000 |
commit | 5a192f85d9d93331cf708eb1cf5e4a5c353910f2 (patch) | |
tree | 46e4364fad3598b7b65281d82c6869c659b67d41 /meta | |
parent | 9ce56ec4ca248cbe3917c0052e9b781f133e178b (diff) | |
download | poky-5a192f85d9d93331cf708eb1cf5e4a5c353910f2.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)
(From OE-Core rev: cf9d3140a9dae5bdc6145ae04a729f4775ae66a2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/bash/bash.inc | 9 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash_3.2.48.bb | 11 |
2 files changed, 13 insertions, 7 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" | |||
22 | ALTERNATIVE_LINK = "${base_bindir}/sh" | 22 | ALTERNATIVE_LINK = "${base_bindir}/sh" |
23 | ALTERNATIVE_PRIORITY = "100" | 23 | ALTERNATIVE_PRIORITY = "100" |
24 | 24 | ||
25 | do_configure () { | 25 | export AUTOHEADER = "true" |
26 | gnu-configize | 26 | |
27 | oe_runconf | 27 | do_configure_prepend () { |
28 | if [ ! -e acinclude.m4 ]; then | ||
29 | cat aclocal.m4 > acinclude.m4 | ||
30 | fi | ||
28 | } | 31 | } |
29 | 32 | ||
30 | pkg_postinst_${PN} () { | 33 | pkg_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+" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" |
7 | DEPENDS = "ncurses" | 7 | DEPENDS = "ncurses" |
8 | 8 | ||
9 | PR = "r7" | 9 | PR = "r8" |
10 | 10 | ||
11 | SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ | 11 | SRC_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" | |||
23 | EXTRA_OECONF = "--with-ncurses" | 23 | EXTRA_OECONF = "--with-ncurses" |
24 | export CC_FOR_BUILD = "${BUILD_CC}" | 24 | export CC_FOR_BUILD = "${BUILD_CC}" |
25 | 25 | ||
26 | do_configure () { | 26 | export AUTOHEADER = "true" |
27 | gnu-configize | 27 | |
28 | oe_runconf | 28 | do_configure_prepend () { |
29 | if [ ! -e acinclude.m4 ]; then | ||
30 | cat aclocal.m4 > acinclude.m4 | ||
31 | fi | ||
29 | } | 32 | } |
30 | 33 | ||
31 | pkg_postinst_${PN} () { | 34 | pkg_postinst_${PN} () { |