Patchwork quilt: add ac_cv_path_BASH to CACHED_CONFIGUREVARS also for native

login
register
mail settings
Submitter Ming Liu
Date Jan. 23, 2014, 5:40 a.m.
Message ID <1390455633-26958-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/65579/
State New
Headers show

Comments

Ming Liu - Jan. 23, 2014, 5:40 a.m.
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.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
 meta/recipes-devtools/quilt/quilt-0.61.inc | 2 ++
 meta/recipes-devtools/quilt/quilt_0.61.bb  | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
Ming Liu - Jan. 23, 2014, 5:56 a.m.
Please ignore this patch, it's not a proper fix, I will send a V2 soon.

//Ming Liu

On 01/23/2014 01:40 PM, Ming Liu wrote:
> 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.
>
> Signed-off-by: Ming Liu <ming.liu@windriver.com>
> ---
>   meta/recipes-devtools/quilt/quilt-0.61.inc | 2 ++
>   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 f751ac8..7c8136f 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"
>   EXTRA_OE_MAKE_ARGS_darwin ?= ""
>   EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}"
>   
> +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
> +
>   # quilt ignores DESTDIR
>   do_install () {
>   	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 565e46a..3a08d13 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 \
>               file://gnu_patch_test_fix_target.patch \
>              "
>   
> -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
> -
>   # fix build-distro specific perl path in the target perl scripts
>   do_install_append() {
>   	for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards

Patch

diff --git a/meta/recipes-devtools/quilt/quilt-0.61.inc b/meta/recipes-devtools/quilt/quilt-0.61.inc
index f751ac8..7c8136f 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"
 EXTRA_OE_MAKE_ARGS_darwin ?= ""
 EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}"
 
+CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
+
 # quilt ignores DESTDIR
 do_install () {
 	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 565e46a..3a08d13 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 \
             file://gnu_patch_test_fix_target.patch \
            "
 
-CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
-
 # fix build-distro specific perl path in the target perl scripts
 do_install_append() {
 	for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards