Patchwork configure: Fix CONFIG_QEMU_HELPERDIR generation

login
register
mail settings
Submitter Michael Tokarev
Date Oct. 21, 2012, 6:58 p.m.
Message ID <508445DD.9020802@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/193052/
State New
Headers show

Comments

Michael Tokarev - Oct. 21, 2012, 6:58 p.m.
On 19.10.2012 23:33, Aurelien Jarno wrote:
> On Wed, Oct 17, 2012 at 07:09:25PM +0200, Jan Kiszka wrote:
>> We need to evaluate $libexecdir in configure, otherwise we literally end
>> up with "${prefix}/libexec" instead of the absolute path as
>> CONFIG_QEMU_HELPERDIR.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  configure |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 353d788..e3a1780 100755
>> --- a/configure
>> +++ b/configure
>> @@ -3227,7 +3227,7 @@ echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
>>  echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
>>  echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
>>  echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
>> -echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
>> +echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak

Somehow I missed this patch, and especially missed this
case when testing initial change.

And I think this is a wrong approach too.

This should be defined as qemu_helperdir variable instead of
CONFIG_QEMU_HELPERDIR, just like all other qemu_*dirs around,
and scripts/create_config will take care of it by expanding
the variable and providing CONFIG_QEMU_HELPERDIR #define.

Something like the attached.

Thanks,

/mjt
Aurelien Jarno - Oct. 22, 2012, 6:12 a.m.
On Sun, Oct 21, 2012 at 10:58:37PM +0400, Michael Tokarev wrote:
> On 19.10.2012 23:33, Aurelien Jarno wrote:
> > On Wed, Oct 17, 2012 at 07:09:25PM +0200, Jan Kiszka wrote:
> >> We need to evaluate $libexecdir in configure, otherwise we literally end
> >> up with "${prefix}/libexec" instead of the absolute path as
> >> CONFIG_QEMU_HELPERDIR.
> >>
> >> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> >> ---
> >>  configure |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/configure b/configure
> >> index 353d788..e3a1780 100755
> >> --- a/configure
> >> +++ b/configure
> >> @@ -3227,7 +3227,7 @@ echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
> >>  echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
> >>  echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
> >>  echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
> >> -echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
> >> +echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak
> 
> Somehow I missed this patch, and especially missed this
> case when testing initial change.
> 
> And I think this is a wrong approach too.
> 
> This should be defined as qemu_helperdir variable instead of
> CONFIG_QEMU_HELPERDIR, just like all other qemu_*dirs around,
> and scripts/create_config will take care of it by expanding
> the variable and providing CONFIG_QEMU_HELPERDIR #define.
> 
> Something like the attached.

This is indeed a better way to fix the issue. I have applied the
attached patch.

> Thanks,
> 
> /mjt

> From 58de50012972699e6bb1362ba39e3326d8f65152 Mon Sep 17 00:00:00 2001
> From: Michael Tokarev <mjt@tls.msk.ru>
> Date: Sun, 21 Oct 2012 22:52:54 +0400
> Subject: [PATCH] fix CONFIG_QEMU_HELPERDIR generation again
> 
> commit 38f419f35225 fixed a breakage with CONFIG_QEMU_HELPERDIR
> which has been introduced by 8bf188aa18ef7a8.  But while techinically
> that fix has been correct, all other similar variables are handled
> differently.  Make it consistent, and let scripts/create_config
> expand and capitalize the variable properly like for all other
> qemu_*dir variables.
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 9f33c7d..fa5657f 100755
> --- a/configure
> +++ b/configure
> @@ -3200,7 +3200,7 @@ echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
>  echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
>  echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
>  echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
> -echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak
> +echo "qemu_helperdir=$libexecdir" >> $config_host_mak
>  
>  echo "ARCH=$ARCH" >> $config_host_mak
>  if test "$debug_tcg" = "yes" ; then
> -- 
> 1.7.10.4
>

Patch

From 58de50012972699e6bb1362ba39e3326d8f65152 Mon Sep 17 00:00:00 2001
From: Michael Tokarev <mjt@tls.msk.ru>
Date: Sun, 21 Oct 2012 22:52:54 +0400
Subject: [PATCH] fix CONFIG_QEMU_HELPERDIR generation again

commit 38f419f35225 fixed a breakage with CONFIG_QEMU_HELPERDIR
which has been introduced by 8bf188aa18ef7a8.  But while techinically
that fix has been correct, all other similar variables are handled
differently.  Make it consistent, and let scripts/create_config
expand and capitalize the variable properly like for all other
qemu_*dir variables.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 9f33c7d..fa5657f 100755
--- a/configure
+++ b/configure
@@ -3200,7 +3200,7 @@  echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
 echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
 echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
 echo "qemu_localstatedir=$local_statedir" >> $config_host_mak
-echo "CONFIG_QEMU_HELPERDIR=\"`eval echo $libexecdir`\"" >> $config_host_mak
+echo "qemu_helperdir=$libexecdir" >> $config_host_mak
 
 echo "ARCH=$ARCH" >> $config_host_mak
 if test "$debug_tcg" = "yes" ; then
-- 
1.7.10.4