From 8503dee5a42fc0dc6dc6c79ce316aba1c91da6d1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 17 Feb 2015 13:48:14 +0100 Subject: utils.bbclass: fix create_cmdline_wrapper 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 "$@" (From OE-Core rev: 49ab89eb9f83388e99069a4b53bdc4cba22bb6f3) Signed-off-by: Javier Viguera Signed-off-by: Richard Purdie --- meta/classes/utils.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 0a533afb1f..775506d44c 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 <$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 } -- cgit 1.2.3-korg