1 files changed, 32 insertions, 78 deletions
diff --git a/meta/classes/features_check.bbclass b/meta/classes/features_check.bbclass
index 876d32e315..4ba827d4ab 100644
--- a/meta/classes/features_check.bbclass
+++ b/meta/classes/features_check.bbclass
@@ -1,23 +1,13 @@
-# Allow checking of required and conflicting DISTRO_FEATURES
+# Allow checking of required and conflicting features
 #
-# ANY_OF_DISTRO_FEATURES:     ensure at least one item on this list is included
+# xxx = [DISTRO,MACHINE,COMBINED]
-#                             in DISTRO_FEATURES.
+#
-# REQUIRED_DISTRO_FEATURES:   ensure every item on this list is included
+# ANY_OF_xxx_FEATURES:        ensure at least one item on this list is included
-#                             in DISTRO_FEATURES.
+#                             in xxx_FEATURES.
-# CONFLICT_DISTRO_FEATURES:   ensure no item in this list is included in
+# REQUIRED_xxx_FEATURES:      ensure every item on this list is included
-#                             DISTRO_FEATURES.
+#                             in xxx_FEATURES.
-# ANY_OF_MACHINE_FEATURES:    ensure at least one item on this list is included
+# CONFLICT_xxx_FEATURES:      ensure no item in this list is included in
-#                             in MACHINE_FEATURES.
+#                             xxx_FEATURES.
-# REQUIRED_MACHINE_FEATURES:  ensure every item on this list is included
-#                             in MACHINE_FEATURES.
-# CONFLICT_MACHINE_FEATURES:  ensure no item in this list is included in
-#                             MACHINE_FEATURES.
-# ANY_OF_COMBINED_FEATURES:   ensure at least one item on this list is included
-#                             in COMBINED_FEATURES.
-# REQUIRED_COMBINED_FEATURES: ensure every item on this list is included
-#                             in COMBINED_FEATURES.
-# CONFLICT_COMBINED_FEATURES: ensure no item in this list is included in
-#                             COMBINED_FEATURES.
 #
 # Copyright 2019 (C) Texas Instruments Inc.
 # Copyright 2013 (C) O.S. Systems Software LTDA.
@@ -26,63 +16,27 @@ python () {
    if d.getVar('PARSE_ALL_RECIPES', False):
        return
-    # Assume at least one var is set.
+    for kind in ['DISTRO', 'MACHINE', 'COMBINED']:
-    distro_features = set((d.getVar('DISTRO_FEATURES') or '').split())
+        # Assume at least one var is set.
+        features = set((d.getVar(kind + '_FEATURES') or '').split())
-    any_of_distro_features = set((d.getVar('ANY_OF_DISTRO_FEATURES') or '').split())
-    if any_of_distro_features:
+        any_of_features = set((d.getVar('ANY_OF_' + kind + '_FEATURES') or '').split())
-        if set.isdisjoint(any_of_distro_features, distro_features):
+        if any_of_features:
-            raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % ' '.join(any_of_distro_features))
+            if set.isdisjoint(any_of_features, features):
+                raise bb.parse.SkipRecipe("one of '%s' needs to be in %s_FEATURES"
-    required_distro_features = set((d.getVar('REQUIRED_DISTRO_FEATURES') or '').split())
+                    % (' '.join(any_of_features), kind))
-    if required_distro_features:
-        missing = set.difference(required_distro_features, distro_features)
+        required_features = set((d.getVar('REQUIRED_' + kind + '_FEATURES') or '').split())
-        if missing:
+        if required_features:
-            raise bb.parse.SkipRecipe("missing required distro feature%s '%s' (not in DISTRO_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))
+            missing = set.difference(required_features, features)
+            if missing:
-    conflict_distro_features = set((d.getVar('CONFLICT_DISTRO_FEATURES') or '').split())
+                raise bb.parse.SkipRecipe("missing required %s feature%s '%s' (not in %s_FEATURES)"
-    if conflict_distro_features:
+                    % (kind.lower(), 's' if len(missing) > 1 else '', ' '.join(missing), kind))
-        conflicts = set.intersection(conflict_distro_features, distro_features)
-        if conflicts:
+        conflict_features = set((d.getVar('CONFLICT_' + kind + '_FEATURES') or '').split())
-            raise bb.parse.SkipRecipe("conflicting distro feature%s '%s' (in DISTRO_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))
+        if conflict_features:
+            conflicts = set.intersection(conflict_features, features)
-    # Assume at least one var is set.
+            if conflicts:
-    machine_features = set((d.getVar('MACHINE_FEATURES') or '').split())
+                raise bb.parse.SkipRecipe("conflicting %s feature%s '%s' (in %s_FEATURES)"
+                    % (kind.lower(), 's' if len(conflicts) > 1 else '', ' '.join(conflicts), kind))
-    any_of_machine_features = set((d.getVar('ANY_OF_MACHINE_FEATURES') or '').split())
-    if any_of_machine_features:
-        if set.isdisjoint(any_of_machine_features, machine_features):
-            raise bb.parse.SkipRecipe("one of '%s' needs to be in MACHINE_FEATURES" % ' '.join(any_of_machine_features))
-    required_machine_features = set((d.getVar('REQUIRED_MACHINE_FEATURES') or '').split())
-    if required_machine_features:
-        missing = set.difference(required_machine_features, machine_features)
-        if missing:
-            raise bb.parse.SkipRecipe("missing required machine feature%s '%s' (not in MACHINE_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))
-    conflict_machine_features = set((d.getVar('CONFLICT_MACHINE_FEATURES') or '').split())
-    if conflict_machine_features:
-        conflicts = set.intersection(conflict_machine_features, machine_features)
-        if conflicts:
-            raise bb.parse.SkipRecipe("conflicting machine feature%s '%s' (in MACHINE_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))
-    # Assume at least one var is set.
-    combined_features = set((d.getVar('COMBINED_FEATURES') or '').split())
-    any_of_combined_features = set((d.getVar('ANY_OF_COMBINED_FEATURES') or '').split())
-    if any_of_combined_features:
-        if set.isdisjoint(any_of_combined_features, combined_features):
-            raise bb.parse.SkipRecipe("one of '%s' needs to be in COMBINED_FEATURES" % ' '.join(any_of_combined_features))
-    required_combined_features = set((d.getVar('REQUIRED_COMBINED_FEATURES') or '').split())
-    if required_combined_features:
-        missing = set.difference(required_combined_features, combined_features)
-        if missing:
-            raise bb.parse.SkipRecipe("missing required machine feature%s '%s' (not in COMBINED_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))
-    conflict_combined_features = set((d.getVar('CONFLICT_COMBINED_FEATURES') or '').split())
-    if conflict_combined_features:
-        conflicts = set.intersection(conflict_combined_features, combined_features)
-        if conflicts:
-            raise bb.parse.SkipRecipe("conflicting machine feature%s '%s' (in COMBINED_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))
 }

diff --git a/meta/classes/features_check.bbclass b/meta/classes/features_check.bbclass index 876d32e315..4ba827d4ab 100644 --- a/meta/classes/features_check.bbclass +++ b/meta/classes/features_check.bbclass
@@ -1,23 +1,13 @@
1	# Allow checking of required and conflicting DISTRO_FEATURES	1	# Allow checking of required and conflicting features
2	#	2	#
3	# ANY_OF_DISTRO_FEATURES: ensure at least one item on this list is included	3	# xxx = [DISTRO,MACHINE,COMBINED]
4	# in DISTRO_FEATURES.	4	#
5	# REQUIRED_DISTRO_FEATURES: ensure every item on this list is included	5	# ANY_OF_xxx_FEATURES: ensure at least one item on this list is included
6	# in DISTRO_FEATURES.	6	# in xxx_FEATURES.
7	# CONFLICT_DISTRO_FEATURES: ensure no item in this list is included in	7	# REQUIRED_xxx_FEATURES: ensure every item on this list is included
8	# DISTRO_FEATURES.	8	# in xxx_FEATURES.
9	# ANY_OF_MACHINE_FEATURES: ensure at least one item on this list is included	9	# CONFLICT_xxx_FEATURES: ensure no item in this list is included in
10	# in MACHINE_FEATURES.	10	# xxx_FEATURES.
11	# REQUIRED_MACHINE_FEATURES: ensure every item on this list is included
12	# in MACHINE_FEATURES.
13	# CONFLICT_MACHINE_FEATURES: ensure no item in this list is included in
14	# MACHINE_FEATURES.
15	# ANY_OF_COMBINED_FEATURES: ensure at least one item on this list is included
16	# in COMBINED_FEATURES.
17	# REQUIRED_COMBINED_FEATURES: ensure every item on this list is included
18	# in COMBINED_FEATURES.
19	# CONFLICT_COMBINED_FEATURES: ensure no item in this list is included in
20	# COMBINED_FEATURES.
21	#	11	#
22	# Copyright 2019 (C) Texas Instruments Inc.	12	# Copyright 2019 (C) Texas Instruments Inc.
23	# Copyright 2013 (C) O.S. Systems Software LTDA.	13	# Copyright 2013 (C) O.S. Systems Software LTDA.
@@ -26,63 +16,27 @@ python () {
26	if d.getVar('PARSE_ALL_RECIPES', False):	16	if d.getVar('PARSE_ALL_RECIPES', False):
27	return	17	return
28		18
29	# Assume at least one var is set.	19	for kind in ['DISTRO', 'MACHINE', 'COMBINED']:
30	distro_features = set((d.getVar('DISTRO_FEATURES') or '').split())	20	# Assume at least one var is set.
31		21	features = set((d.getVar(kind + '_FEATURES') or '').split())
32	any_of_distro_features = set((d.getVar('ANY_OF_DISTRO_FEATURES') or '').split())	22
33	if any_of_distro_features:	23	any_of_features = set((d.getVar('ANY_OF_' + kind + '_FEATURES') or '').split())
34	if set.isdisjoint(any_of_distro_features, distro_features):	24	if any_of_features:
35	raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % ' '.join(any_of_distro_features))	25	if set.isdisjoint(any_of_features, features):
36		26	raise bb.parse.SkipRecipe("one of '%s' needs to be in %s_FEATURES"
37	required_distro_features = set((d.getVar('REQUIRED_DISTRO_FEATURES') or '').split())	27	% (' '.join(any_of_features), kind))
38	if required_distro_features:	28
39	missing = set.difference(required_distro_features, distro_features)	29	required_features = set((d.getVar('REQUIRED_' + kind + '_FEATURES') or '').split())
40	if missing:	30	if required_features:
41	raise bb.parse.SkipRecipe("missing required distro feature%s '%s' (not in DISTRO_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))	31	missing = set.difference(required_features, features)
42		32	if missing:
43	conflict_distro_features = set((d.getVar('CONFLICT_DISTRO_FEATURES') or '').split())	33	raise bb.parse.SkipRecipe("missing required %s feature%s '%s' (not in %s_FEATURES)"
44	if conflict_distro_features:	34	% (kind.lower(), 's' if len(missing) > 1 else '', ' '.join(missing), kind))
45	conflicts = set.intersection(conflict_distro_features, distro_features)	35
46	if conflicts:	36	conflict_features = set((d.getVar('CONFLICT_' + kind + '_FEATURES') or '').split())
47	raise bb.parse.SkipRecipe("conflicting distro feature%s '%s' (in DISTRO_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))	37	if conflict_features:
48		38	conflicts = set.intersection(conflict_features, features)
49	# Assume at least one var is set.	39	if conflicts:
50	machine_features = set((d.getVar('MACHINE_FEATURES') or '').split())	40	raise bb.parse.SkipRecipe("conflicting %s feature%s '%s' (in %s_FEATURES)"
51		41	% (kind.lower(), 's' if len(conflicts) > 1 else '', ' '.join(conflicts), kind))
52	any_of_machine_features = set((d.getVar('ANY_OF_MACHINE_FEATURES') or '').split())
53	if any_of_machine_features:
54	if set.isdisjoint(any_of_machine_features, machine_features):
55	raise bb.parse.SkipRecipe("one of '%s' needs to be in MACHINE_FEATURES" % ' '.join(any_of_machine_features))
56
57	required_machine_features = set((d.getVar('REQUIRED_MACHINE_FEATURES') or '').split())
58	if required_machine_features:
59	missing = set.difference(required_machine_features, machine_features)
60	if missing:
61	raise bb.parse.SkipRecipe("missing required machine feature%s '%s' (not in MACHINE_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))
62
63	conflict_machine_features = set((d.getVar('CONFLICT_MACHINE_FEATURES') or '').split())
64	if conflict_machine_features:
65	conflicts = set.intersection(conflict_machine_features, machine_features)
66	if conflicts:
67	raise bb.parse.SkipRecipe("conflicting machine feature%s '%s' (in MACHINE_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))
68
69	# Assume at least one var is set.
70	combined_features = set((d.getVar('COMBINED_FEATURES') or '').split())
71
72	any_of_combined_features = set((d.getVar('ANY_OF_COMBINED_FEATURES') or '').split())
73	if any_of_combined_features:
74	if set.isdisjoint(any_of_combined_features, combined_features):
75	raise bb.parse.SkipRecipe("one of '%s' needs to be in COMBINED_FEATURES" % ' '.join(any_of_combined_features))
76
77	required_combined_features = set((d.getVar('REQUIRED_COMBINED_FEATURES') or '').split())
78	if required_combined_features:
79	missing = set.difference(required_combined_features, combined_features)
80	if missing:
81	raise bb.parse.SkipRecipe("missing required machine feature%s '%s' (not in COMBINED_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing)))
82
83	conflict_combined_features = set((d.getVar('CONFLICT_COMBINED_FEATURES') or '').split())
84	if conflict_combined_features:
85	conflicts = set.intersection(conflict_combined_features, combined_features)
86	if conflicts:
87	raise bb.parse.SkipRecipe("conflicting machine feature%s '%s' (in COMBINED_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts)))
88	}	42	}