summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@windriver.com>2022-02-04 09:01:40 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-21 23:37:27 +0000
commit297def3be506ad974bde896768c2abb7c5264749 (patch)
tree3ca7e025790687b0d13e1cab9596b87f793330cc /meta/conf/distro
parented198efba4832f96e6835d0d6700b0408b0c2d43 (diff)
downloadpoky-297def3be506ad974bde896768c2abb7c5264749.tar.gz
blacklist: Replace class with SKIP_RECIPE variable
Remove the old class and rename VarFlag to SKIP_RECIPE, handling this in base.bbclass for efficiency. This means a separate inherit is no longer needed. This change better describes what the VarFlag is doing since it is implemeted with the SkipRecipe() function. By moving this into base.bbclass we simplify the distro inherit. (From OE-Core rev: a5f735746cba6af41a25aa2aa121453a8bc363b4) Signed-off-by: Saul Wold <saul.wold@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/defaultsetup.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index b36a4ffffe..f6894f3ab5 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -14,9 +14,8 @@ TMPDIR .= "${TCLIBCAPPEND}"
14 14
15USER_CLASSES ?= "" 15USER_CLASSES ?= ""
16PACKAGE_CLASSES ?= "package_ipk" 16PACKAGE_CLASSES ?= "package_ipk"
17INHERIT_BLACKLIST = "blacklist"
18INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool" 17INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool"
19INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}" 18INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO}"
20 19
21INIT_MANAGER ??= "none" 20INIT_MANAGER ??= "none"
22require conf/distro/include/init-manager-${INIT_MANAGER}.inc 21require conf/distro/include/init-manager-${INIT_MANAGER}.inc