build: add featureset features

freifunk-gluon · Dec 30, 2019 · e61143d · e61143d
1 parent 510fac8
commit e61143d
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -108,10 +108,18 @@ GLUON_DEFAULT_PACKAGES :=
 GLUON_FEATURESET_DEFAULT_PACKAGES := hostapd-openssl gluon-featureset-default
 GLUON_FEATURESET_TINY_PACKAGES := hostapd-mini gluon-featureset-tiny
 
-GLUON_FEATURE_PACKAGES := $(shell scripts/features.sh '$(GLUON_FEATURES)' || echo '__ERROR__')
-ifneq ($(filter __ERROR__,$(GLUON_FEATURE_PACKAGES)),)
-$(error Error while evaluating GLUON_FEATURES)
-endif
+GLUON_FEATURE_PACKAGES := 
+GLUON_FEATURE_PACKAGES_TINY := 
+GLUON_FEATURE_PACKAGES_DEFAULT := 
+define feature_packages
+  $(1) := $(shell scripts/features.sh '$(2)' || echo '__ERROR__')
+  ifneq ($(filter __ERROR__,$(1)),)
+  $(error Error while evaluating features)
+  endif
+endef
+$(eval $(call merge_packages,$(GLUON_FEATURE_PACKAGES), $(GLUON_FEATURES)))
+$(eval $(call merge_packages,$(GLUON_FEATURE_PACKAGES_TINY), $(GLUON_FEATURES_TINY)))
+$(eval $(call merge_packages,$(GLUON_FEATURE_PACKAGES_DEFAULT), $(GLUON_FEATURES_DEFAULT)))
 
 
 GLUON_PACKAGES :=