summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-30 16:55:10 (GMT)
committer Richard Purdie <richard.purdie@linuxfoundation.org>2013-05-30 20:10:23 (GMT)
commit3aaa4f78c609a47324da2db3b5c92a28f4f2ccff (patch)
tree42ad1eb0515aa5ced404bc351664e6d5523dc49d
parent29049da22197bd05b88619b9e8caea7bbdd2ee46 (diff)
downloadpoky-3aaa4f78c609a47324da2db3b5c92a28f4f2ccff.zip
poky-3aaa4f78c609a47324da2db3b5c92a28f4f2ccff.tar.gz
poky-3aaa4f78c609a47324da2db3b5c92a28f4f2ccff.tar.bz2
utils.bbclass: ensure $0 is correct in wrapper scripts
Some packages (eg mesa) will invoke a tool with --version and do string matches on the output (i.e. mesa does $LEX --version |grep "^flex "). This doesn't work with the combination of wrapper scripts and binaries that use $0 as they output "flex.real". Luckily bash's exec lets you set $0. As we want to use this we can't use env, but using export appears to work just as well. (From OE-Core rev: e8d2a2a3646f964ec61ece62e14788cd7184dd01) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/utils.bbclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index be0a25a..cf8893f 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -261,9 +261,9 @@ create_cmdline_wrapper () {
mv $cmd $cmd.real
cmdname=`basename $cmd`.real
cat <<END >$cmd
-#!/bin/sh
+#!/bin/bash
realpath=\`readlink -fn \$0\`
-exec \`dirname \$realpath\`/$cmdname $@ "\$@"
+exec -a $cmd \`dirname \$realpath\`/$cmdname $@ "\$@"
END
chmod +x $cmd
}
@@ -284,9 +284,10 @@ create_wrapper () {
mv $cmd $cmd.real
cmdname=`basename $cmd`.real
cat <<END >$cmd
-#!/bin/sh
+#!/bin/bash
realpath=\`readlink -fn \$0\`
-exec env $@ \`dirname \$realpath\`/$cmdname "\$@"
+export $@
+exec -a $cmd \`dirname \$realpath\`/$cmdname "\$@"
END
chmod +x $cmd
}