summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiqun Lin <Shiqun.Lin@windriver.com>2015-01-07 15:00:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-20 21:41:09 +0100
commit66e2eef21dedafdf89e2892125ba0f3b9fce87d3 (patch)
tree149710d33b78d4a8be88e72cd8f1aab503fd5292
parent9ceff87e7130ef781221c2d270333858ee3e944b (diff)
downloadpoky-66e2eef21dedafdf89e2892125ba0f3b9fce87d3.tar.gz
sanity.bbclass: improve the sanity check for PATH and BBPATH
Build fails if "./" is in the PATH To reproduce the issue: $ export PATH="./:$PATH" $ make -C build-tools elfutils Error: ./ld: unrecognized option '--sysroot=/' (From OE-Core rev: b6a23572b8f14e27d4341892b9069e7cac1e9c14) Signed-off-by: Shiqun Lin <Shiqun.Lin@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index fc8c980515..e7381107ad 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -653,9 +653,9 @@ def check_sanity_version_change(status, d):
653 status.addresult("You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n") 653 status.addresult("You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n")
654 654
655 bbpaths = d.getVar('BBPATH', True).split(":") 655 bbpaths = d.getVar('BBPATH', True).split(":")
656 if ("." in bbpaths or "" in bbpaths) and not status.reparse: 656 if ("." in bbpaths or "./" in bbpaths or "" in bbpaths) and not status.reparse:
657 status.addresult("BBPATH references the current directory, either through " \ 657 status.addresult("BBPATH references the current directory, either through " \
658 "an empty entry, or a '.'.\n\t This is unsafe and means your "\ 658 "an empty entry, a './' or a '.'.\n\t This is unsafe and means your "\
659 "layer configuration is adding empty elements to BBPATH.\n\t "\ 659 "layer configuration is adding empty elements to BBPATH.\n\t "\
660 "Please check your layer.conf files and other BBPATH " \ 660 "Please check your layer.conf files and other BBPATH " \
661 "settings to remove the current working directory " \ 661 "settings to remove the current working directory " \
@@ -693,8 +693,8 @@ def check_sanity_everybuild(status, d):
693 sanity_check_conffiles(status, d) 693 sanity_check_conffiles(status, d)
694 694
695 paths = d.getVar('PATH', True).split(":") 695 paths = d.getVar('PATH', True).split(":")
696 if "." in paths or "" in paths: 696 if "." in paths or "./" in paths or "" in paths:
697 status.addresult("PATH contains '.' or '' (empty element), which will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n") 697 status.addresult("PATH contains '.', './' or '' (empty element), which will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
698 698
699 # Check that the DISTRO is valid, if set 699 # Check that the DISTRO is valid, if set
700 # need to take into account DISTRO renaming DISTRO 700 # need to take into account DISTRO renaming DISTRO