diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-08 21:33:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:51:18 +0000 |
commit | 5d3860f4a8abb8e95442b04f8b84a333af362fcd (patch) | |
tree | 16e4b98abf972410eef0175aa09ef2dd918e0016 /meta/classes | |
parent | d9740cdcd7d4b19eccae27665d9ce92632d6349a (diff) | |
download | poky-5d3860f4a8abb8e95442b04f8b84a333af362fcd.tar.gz |
Allow use of dash as /bin/sh
We've had the check for dash as /bin/sh for a long time. Dash has been
around long enough now that most major issues have been identified and
fixed from build perspective.
This patch fixes a bashism in the openjade-native recipe. It also
adjusts libtool so that the header at the script is used and not the
value of $SHELL. This is because many Makefiles change $SHELL so dash
can get used to execute what is otherwise configured as a bash shell
script. Since we don't need to execute scripts this way on any system I'm
aware of us building upon, the simplest fix is just to remove $SHELL.
With these two changes the dash check can be removed and we can allow
builds with dash as /bin/sh
(From OE-Core rev: 07ded02ffd37b4fe60a6210dbf56490ea306f0b6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Note: I know I need to add the description of the libtool change above
into the prefix.patch]
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sanity.bbclass | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 3f42b4f7cd..838448f33c 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -331,9 +331,6 @@ def check_sanity(e): | |||
331 | if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': | 331 | if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': |
332 | messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' | 332 | messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' |
333 | 333 | ||
334 | if os.path.basename(os.readlink('/bin/sh')) == 'dash': | ||
335 | messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n" | ||
336 | |||
337 | omask = os.umask(022) | 334 | omask = os.umask(022) |
338 | if omask & 0755: | 335 | if omask & 0755: |
339 | messages = messages + "Please use a umask which allows a+rx and u+rwx\n" | 336 | messages = messages + "Please use a umask which allows a+rx and u+rwx\n" |