build: add featureset specific GLUON_FEATURES

Makefile

@@ -108,19 +108,31 @@ 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 :=
+GLUON_PACKAGES_DEFAULT :=
+GLUON_PACKAGES_TINY :=
 define merge_packages
-  $(foreach pkg,$(1),
-    GLUON_PACKAGES := $$(strip $$(filter-out -$$(patsubst -%,%,$(pkg)) $$(patsubst -%,%,$(pkg)),$$(GLUON_PACKAGES)) $(pkg))
+  $(foreach pkg,$(2),
+    $(1) := $$(strip $$(filter-out -$$(patsubst -%,%,$(pkg)) $$(patsubst -%,%,$(pkg)),$$(GLUON_PACKAGES)) $(pkg))
   )
 endef
-$(eval $(call merge_packages,$(GLUON_DEFAULT_PACKAGES) $(GLUON_FEATURE_PACKAGES) $(GLUON_SITE_PACKAGES)))
+$(eval $(call merge_packages, GLUON_PACKAGES, $(GLUON_DEFAULT_PACKAGES) $(GLUON_FEATURE_PACKAGES) $(GLUON_SITE_PACKAGES)))
+$(eval $(call merge_packages, GLUON_PACKAGES_DEFAULT, $(GLUON_FEATURESET_DEFAULT_PACKAGES) $(GLUON_FEATURE_PACKAGES_DEFAULT) $(GLUON_SITE_PACKAGES_DEFAULT)))
+$(eval $(call merge_packages, GLUON_PACKAGES_TINY, $(GLUON_FEATURESET_TINY_PACKAGES) $(GLUON_FEATURE_PACKAGES_TINY) $(GLUON_SITE_PACKAGES_TINY)))
 
 
 LUA := openwrt/staging_dir/hostpkg/bin/lua