nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inclusion of profile-specific packages from OpenWRT

Browse Source
This commit is contained in:
Matthias Schiffer 2013-10-08 03:57:08 +02:00
parent d88fd8f8eb
commit 7087e591c0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -69,21 +69,30 @@ include tools/Makefile
include toolchain/Makefile include toolchain/Makefile
BOARD := ar71xx BOARD := ar71xx
override SUBTARGET := generic
PROFILES := PROFILES :=
PROFILE_PACKAGES := PROFILE_PACKAGES :=
gluon_prepared_stamp := $(GLUON_BUILDDIR)/$(BOARD)/prepared gluon_prepared_stamp := $(GLUON_BUILDDIR)/$(BOARD)/prepared
define Profile
$(eval $(call Profile/Default))
$(eval $(call Profile/$(1)))
$(1)_PACKAGES := $(PACKAGES)
endef
define GluonProfile define GluonProfile
image/$(1): $(gluon_prepared_stamp) image/$(1): $(gluon_prepared_stamp)
+$(GLUONMAKE) image PROFILE="$(1)" V=s$(OPENWRT_VERBOSE) +$(GLUONMAKE) image PROFILE="$(1)" V=s$(OPENWRT_VERBOSE)
PROFILES += $(1) PROFILES += $(1)
PROFILE_PACKAGES += $(filter-out -%,$(2) $(GLUON_$(1)_SITE_PACKAGES)) PROFILE_PACKAGES += $(filter-out -%,$($(1)_PACKAGES) $(2) $(GLUON_$(1)_SITE_PACKAGES))
GLUON_$(1)_DEFAULT_PACKAGES := $(2) GLUON_$(1)_DEFAULT_PACKAGES := $(2)
endef endef
include $(INCLUDE_DIR)/target.mk
include $(GLUONDIR)/include/profiles.mk include $(GLUONDIR)/include/profiles.mk