Patchwork [V2] quilt: add ac_cv_path_BASH to CACHED_CONFIGUREVARS also for native

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

Comments

Ming Liu - Jan. 23, 2014, 6:45 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(-)
Phil Blundell - Jan. 23, 2014, 7:14 a.m.
On Thu, 2014-01-23 at 14:45 +0800, Ming Liu wrote:
>  
> +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
>  
> -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"

Why did you change this from ${base_bindir} to a hardcoded path?

p.
Ming Liu - Jan. 23, 2014, 7:22 a.m.
On 01/23/2014 03:14 PM, Phil Blundell wrote:
> On Thu, 2014-01-23 at 14:45 +0800, Ming Liu wrote:
>>   
>> +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
>>   
>> -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
> Why did you change this from ${base_bindir} to a hardcoded path?
Because base_bindir would be expanded as '${base_prefix}/bin' for native 
recipe, then it has to set DEPENDS on bash-native which I think is not 
what it supposed to be, the change would let it locate bash from host 
environment.

//Ming Liu
>
> p.
>
>
>
>
Otavio Salvador - Jan. 23, 2014, 11:29 a.m.
On Thu, Jan 23, 2014 at 5:22 AM, Ming Liu <ming.liu@windriver.com> wrote:
> On 01/23/2014 03:14 PM, Phil Blundell wrote:
>>
>> On Thu, 2014-01-23 at 14:45 +0800, Ming Liu wrote:
>>>
>>>   +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
>>>   -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
>>
>> Why did you change this from ${base_bindir} to a hardcoded path?
>
> Because base_bindir would be expanded as '${base_prefix}/bin' for native
> recipe, then it has to set DEPENDS on bash-native which I think is not what
> it supposed to be, the change would let it locate bash from host
> environment.

I don't think so.

% git grep base_prefix meta/conf/bitbake.conf
meta/conf/bitbake.conf:export base_prefix = ""
meta/conf/bitbake.conf:export base_bindir = "${base_prefix}/bin"
...
Richard Purdie - Jan. 28, 2014, 12:30 p.m.
On Thu, 2014-01-23 at 09:29 -0200, Otavio Salvador wrote:
> On Thu, Jan 23, 2014 at 5:22 AM, Ming Liu <ming.liu@windriver.com> wrote:
> > On 01/23/2014 03:14 PM, Phil Blundell wrote:
> >>
> >> On Thu, 2014-01-23 at 14:45 +0800, Ming Liu wrote:
> >>>
> >>>   +CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
> >>>   -CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
> >>
> >> Why did you change this from ${base_bindir} to a hardcoded path?
> >
> > Because base_bindir would be expanded as '${base_prefix}/bin' for native
> > recipe, then it has to set DEPENDS on bash-native which I think is not what
> > it supposed to be, the change would let it locate bash from host
> > environment.
> 
> I don't think so.
> 
> % git grep base_prefix meta/conf/bitbake.conf
> meta/conf/bitbake.conf:export base_prefix = ""
> meta/conf/bitbake.conf:export base_bindir = "${base_prefix}/bin"

Consider what native.bbclass does to this though. I suspect Ming is
correct here...

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/quilt/quilt-0.61.inc b/meta/recipes-devtools/quilt/quilt-0.61.inc
index f751ac8..19966c8 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=/bin/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