[PATCH][master][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper

[PATCH][master][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper

[Javier Viguera]

Similar to commit 4569d74 for create_wrapper function, this commit fixes
hardcoded absolute build paths in create_cmdline_wrapper.

Otherwise we end up with incorrect paths in users of this function. For
example the 'file' wrapper in current released toolchain:

exec -a
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-arm/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-file/5.18-r0/image//opt/poky/1.7.1/sysroots/x86_64-pokysdk-linux/usr/bin/file
`dirname $realpath`/file.real --magic-file
/opt/poky/1.7.1/sysroots/x86_64-pokysdk-linux/usr/share/misc/magic.mgc
"$@"

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta/classes/utils.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 0f2a48409170..80e90e87778b 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -259,11 +259,11 @@ create_cmdline_wrapper () {
 	echo "Generating wrapper script for $cmd"
 
 	mv $cmd $cmd.real
-	cmdname=`basename $cmd`.real
+	cmdname=`basename $cmd`
 	cat <<END >$cmd
 #!/bin/bash
 realpath=\`readlink -fn \$0\`
-exec -a $cmd \`dirname \$realpath\`/$cmdname $@ "\$@"
+exec -a \`dirname \$realpath\`/$cmdname \`dirname \$realpath\`/$cmdname.real $@ "\$@"
 END
 	chmod +x $cmd
 }

[backport][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper

[Javier Viguera]

Hi all,

I see this patch was merged into master. Thanks for that.

Could it be backported to Daisy and Dizzy?

A cherry-pick of the commit in master should apply just fine.

-
Thanks,

Javier Viguera

Re: [backport][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper

[Javier Viguera]

On 24/02/15 18:45, Javier Viguera wrote:
> Hi all,
>
> I see this patch was merged into master. Thanks for that.
>
> Could it be backported to Daisy and Dizzy?
>
> A cherry-pick of the commit in master should apply just fine.

Ping.

Master commit: 49ab89eb9f83388e99069a4b53bdc4cba22bb6f3

-
Regards,

Javier Viguera

Re: [backport][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper

[Otavio Salvador]

Hello Javier,

On Tue, Mar 3, 2015 at 8:00 AM, Javier Viguera <javier.viguera@digi.com> wrote:
> On 24/02/15 18:45, Javier Viguera wrote:
>>
>> Hi all,
>>
>> I see this patch was merged into master. Thanks for that.
>>
>> Could it be backported to Daisy and Dizzy?
>>
>> A cherry-pick of the commit in master should apply just fine.
>
>
> Ping.
>
> Master commit: 49ab89eb9f83388e99069a4b53bdc4cba22bb6f3

Adding Saul in Cc.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [backport][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper

[Saul Wold]

On 03/03/2015 04:17 AM, Otavio Salvador wrote:
> Hello Javier,
>
> On Tue, Mar 3, 2015 at 8:00 AM, Javier Viguera <javier.viguera@digi.com> wrote:
>> On 24/02/15 18:45, Javier Viguera wrote:
>>>
>>> Hi all,
>>>
>>> I see this patch was merged into master. Thanks for that.
>>>
>>> Could it be backported to Daisy and Dizzy?
>>>
>>> A cherry-pick of the commit in master should apply just fine.
>>
>>
>> Ping.
>>
>> Master commit: 49ab89eb9f83388e99069a4b53bdc4cba22bb6f3
>
> Adding Saul in Cc.
>
Added to my pending branch for Daisy, I am doing a sweep of the list now 
for a 1.6.3 build later this week.

Sau!

Re: [backport][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper

[Viguera, Javier]

Hi Saul,

> Added to my pending branch for Daisy, I am doing a sweep of the list
> now
> for a 1.6.3 build later this week.
> 
> Sau!

I see this patch didn't make it to the just-built 'yocto-1.6.3.rc1'.

Is there any problem with it? It's included in master and Dizzy but if it needs rework for Daisy I can do that.

-
Thanks

Javier Viguera