From: Gregor Zatko Date: Sun, 24 May 2020 10:24:04 +0000 (+0200) Subject: sanity.bbclass: Detect and fail if 'inherit' is used in conf file X-Git-Tag: 2020-04.1-dunfell~27 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=bc6e27aeed5d536d2b764949c307f260f78b7810;p=openembedded-core.git 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] Signed-off-by: Gregor Zatko Signed-off-by: Richard Purdie (cherry picked from commit 07bf9b460fe97dec86439302a83bbefa8bac9d70) Signed-off-by: Steve Sakoman --- diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 9e87101738..5ddde9cc9c 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d): if "." in paths or "./" in paths or "" in paths: status.addresult("PATH contains '.', './' or '' (empty element), which will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n") + # Check whether 'inherit' directive is found (used for a class to inherit) + # in conf file it's supposed to be uppercase INHERIT + inherit = d.getVar('inherit') + if inherit: + 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") + # Check that the DISTRO is valid, if set # need to take into account DISTRO renaming DISTRO distro = d.getVar('DISTRO')