From: Olof Johansson Date: Wed, 10 Aug 2016 07:38:48 +0000 (+0200) Subject: sanity.bbclass: Only verify /bin/sh link if it's a link X-Git-Tag: uninative-1.4~586 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=eaa0dc21a5f058a39bd7867bd3cafdb3407abe36;p=openembedded-core.git sanity.bbclass: Only verify /bin/sh link if it's a link If /bin/sh is a regular file (and not a symlink), we assume it's a reasonable shell and allow it. Signed-off-by: Olof Johansson Signed-off-by: Ross Burton --- diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 088dd2ac23..98345ce103 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -932,10 +932,11 @@ def check_sanity_everybuild(status, d): with open(checkfile, "w") as f: f.write(tmpdir) - # Check /bin/sh links to dash or bash - real_sh = os.path.realpath('/bin/sh') - if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'): - status.addresult("Error, /bin/sh links to %s, must be dash or bash\n" % real_sh) + # If /bin/sh is a symlink, check that it points to dash or bash + if os.path.islink('/bin/sh'): + real_sh = os.path.realpath('/bin/sh') + if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'): + status.addresult("Error, /bin/sh links to %s, must be dash or bash\n" % real_sh) def check_sanity(sanity_data): class SanityStatus(object):