diff options
| -rw-r--r-- | meta/classes/sanity.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index b5f4756f81..e3be40bf94 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
| @@ -935,7 +935,9 @@ def check_sanity_everybuild(status, d): | |||
| 935 | # If /bin/sh is a symlink, check that it points to dash or bash | 935 | # If /bin/sh is a symlink, check that it points to dash or bash |
| 936 | if os.path.islink('/bin/sh'): | 936 | if os.path.islink('/bin/sh'): |
| 937 | real_sh = os.path.realpath('/bin/sh') | 937 | real_sh = os.path.realpath('/bin/sh') |
| 938 | if not real_sh.endswith('/dash') and not real_sh.endswith('/bash'): | 938 | # Due to update-alternatives, the shell name may take various |
| 939 | # forms, such as /bin/dash, bin/bash, /bin/bash.bash ... | ||
| 940 | if '/dash' not in real_sh and '/bash' not in real_sh: | ||
| 939 | status.addresult("Error, /bin/sh links to %s, must be dash or bash\n" % real_sh) | 941 | status.addresult("Error, /bin/sh links to %s, must be dash or bash\n" % real_sh) |
| 940 | 942 | ||
| 941 | def check_sanity(sanity_data): | 943 | def check_sanity(sanity_data): |