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

Always ignore profile-specific packages supplied by OpenWrt

Browse Source
This commit is contained in:
Matthias Schiffer 2014-08-08 17:34:50 +02:00
parent d2d8f6d564
commit 1c1fbe38d5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -121,12 +121,11 @@ PROFILE_PACKAGES :=
define Profile define Profile
$(eval $(call Profile/Default)) $(eval $(call Profile/Default))
$(eval $(call Profile/$(1))) $(eval $(call Profile/$(1)))
$(1)_PACKAGES := $(PACKAGES)
endef endef
define GluonProfile define GluonProfile
PROFILES += $(1) PROFILES += $(1)
PROFILE_PACKAGES += $(filter-out -%,$($(1)_PACKAGES) $(2) $(GLUON_$(1)_SITE_PACKAGES)) PROFILE_PACKAGES += $(filter-out -%,$(2) $(GLUON_$(1)_SITE_PACKAGES))
GLUON_$(1)_DEFAULT_PACKAGES := $(2) GLUON_$(1)_DEFAULT_PACKAGES := $(2)
GLUON_$(1)_MODELS := GLUON_$(1)_MODELS :=
endef endef
@ -303,7 +302,7 @@ enable_initscripts: FORCE
# Generate package list # Generate package list
$(eval $(call merge-lists,INSTALL_PACKAGES,DEFAULT_PACKAGES $(PROFILE)_PACKAGES GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_$(PROFILE)_DEFAULT_PACKAGES GLUON_$(PROFILE)_SITE_PACKAGES)) $(eval $(call merge-lists,INSTALL_PACKAGES,DEFAULT_PACKAGES GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_$(PROFILE)_DEFAULT_PACKAGES GLUON_$(PROFILE)_SITE_PACKAGES))
package_install: FORCE package_install: FORCE
$(OPKG) update $(OPKG) update

2
include/gluon.mk
View File

@ -60,7 +60,7 @@ endef
regex-escape = $(shell echo '$(1)' | sed -e 's/[]\/()$*.^|[]/\\&/g') regex-escape = $(shell echo '$(1)' | sed -e 's/[]\/()$*.^|[]/\\&/g')
GLUON_DEFAULT_PACKAGES := gluon-core kmod-ipv6 firewall ip6tables -uboot-envtools -kmod-usb-core -kmod-usb2 -kmod-ledtrig-usbdev GLUON_DEFAULT_PACKAGES := gluon-core kmod-ipv6 firewall ip6tables -uboot-envtools
override DEFAULT_PACKAGES.router := override DEFAULT_PACKAGES.router :=