[oe-commits] [openembedded-core] 13/62: sanity.bbclass: Only verify /bin/sh link if it's a link

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit eaa0dc21a5f058a39bd7867bd3cafdb3407abe36
Author: Olof Johansson <olof.johansson at axis.com>
AuthorDate: Wed Aug 10 09:38:48 2016 +0200

    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 <olof.johansson at axis.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/sanity.bbclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 088dd2a..98345ce 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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.