summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregor Zatko <gzatko@gmail.com>2020-05-24 12:24:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-24 23:56:03 +0100
commitd16186c47cd58fd6d0a0ddd2ba412c8ed1753551 (patch)
treec23563811dead87fc625d80e6fa2464ff78a8e8b
parent6b3b5ab4ba74030db65906abd89491fce44c0f12 (diff)
downloadpoky-d16186c47cd58fd6d0a0ddd2ba412c8ed1753551.tar.gz
sanity.bbclass: Detect and fail if 'inherit' is used in conf file
'inherit' directive may not be used in conf files as it's supposed to be used for the inheritance of classes. Correct form in conf file is INHERIT. This commit adds: - a sanity check to find whether the wrong case exists - fail the build if so - tell user about the difference in directives [YOCTO #5426] (From OE-Core rev: 07bf9b460fe97dec86439302a83bbefa8bac9d70) Signed-off-by: Gregor Zatko <gzatko@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..e021b9d240 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
784 if "." in paths or "./" in paths or "" in paths: 784 if "." in paths or "./" in paths or "" in paths:
785 status.addresult("PATH contains '.', './' or '' (empty element), which will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n") 785 status.addresult("PATH contains '.', './' or '' (empty element), which will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
786 786
787 # Check whether 'inherit' directive is found (used for a class to inherit)
788 # in conf file it's supposed to be uppercase INHERIT
789 inherit = d.getVar('inherit')
790 if inherit:
791 status.addresult("Please don't use inherit directive in your local.conf. The directive is supposed to be used in classes and recipes only to inherit of bbclasses. Here INHERIT should be used.\n")
792
787 # Check that the DISTRO is valid, if set 793 # Check that the DISTRO is valid, if set
788 # need to take into account DISTRO renaming DISTRO 794 # need to take into account DISTRO renaming DISTRO
789 distro = d.getVar('DISTRO') 795 distro = d.getVar('DISTRO')