diff options
author | Ming Liu <ming.liu@windriver.com> | 2014-01-23 14:45:48 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 11:22:09 +0000 |
commit | e54c1ad651886cd7e7c4cc395dbe78dcda7c5347 (patch) | |
tree | d5825a995424ccea2f6c3e59b0840166b78e8958 | |
parent | 81325a412b1983ba7af92ef141fd471e37d6a448 (diff) | |
download | poky-e54c1ad651886cd7e7c4cc395dbe78dcda7c5347.tar.gz |
quilt: add ac_cv_path_BASH to CACHED_CONFIGUREVARS also for native
A issue was fixed in target recipe with commit: 95893404
[
quilt: added ac_cv_path_BASH to CACHED_CONFIGUREVARS
On Fedora 17, bash has moved to /usr/bin/bash and the configure process finds it
on the host machine there, this ensures that it is set correctly for the target.
[YOCTO #2363]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
]
But it's also impacting native package in the case that the sstate is used
between Fedora 17(or later) and other hosts.
(From OE-Core rev: 34bd53c657f82a402723fcf2640b0511a68b6af5)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/quilt/quilt-0.61.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.61.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-0.61.inc b/meta/recipes-devtools/quilt/quilt-0.61.inc index f751ac83f3..19966c8389 100644 --- a/meta/recipes-devtools/quilt/quilt-0.61.inc +++ b/meta/recipes-devtools/quilt/quilt-0.61.inc | |||
@@ -31,6 +31,8 @@ RDEPENDS_${PN} = "bash" | |||
31 | EXTRA_OE_MAKE_ARGS_darwin ?= "" | 31 | EXTRA_OE_MAKE_ARGS_darwin ?= "" |
32 | EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" | 32 | EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" |
33 | 33 | ||
34 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" | ||
35 | |||
34 | # quilt ignores DESTDIR | 36 | # quilt ignores DESTDIR |
35 | do_install () { | 37 | do_install () { |
36 | oe_runmake ${EXTRA_OE_MAKE_ARGS} install | 38 | oe_runmake ${EXTRA_OE_MAKE_ARGS} install |
diff --git a/meta/recipes-devtools/quilt/quilt_0.61.bb b/meta/recipes-devtools/quilt/quilt_0.61.bb index 565e46a39f..3a08d13eaf 100644 --- a/meta/recipes-devtools/quilt/quilt_0.61.bb +++ b/meta/recipes-devtools/quilt/quilt_0.61.bb | |||
@@ -5,8 +5,6 @@ SRC_URI += "file://aclocal.patch \ | |||
5 | file://gnu_patch_test_fix_target.patch \ | 5 | file://gnu_patch_test_fix_target.patch \ |
6 | " | 6 | " |
7 | 7 | ||
8 | CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash" | ||
9 | |||
10 | # fix build-distro specific perl path in the target perl scripts | 8 | # fix build-distro specific perl path in the target perl scripts |
11 | do_install_append() { | 9 | do_install_append() { |
12 | for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards | 10 | for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards |