From 1c1fbe38d5cd0e29a2aee38d38c2573738ce9676 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 8 Aug 2014 17:34:50 +0200
Subject: [PATCH] Always ignore profile-specific packages supplied by OpenWrt

---
 Makefile         | 5 ++---
 include/gluon.mk | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f33913914..e9d770c02 100644
--- a/Makefile
+++ b/Makefile
@@ -121,12 +121,11 @@ PROFILE_PACKAGES :=
 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))
-  $(1)_PACKAGES := $(PACKAGES)
 endef
 
 define GluonProfile
 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)_MODELS :=
 endef
@@ -303,7 +302,7 @@ enable_initscripts: FORCE
 
 
 # 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
 	$(OPKG) update
diff --git a/include/gluon.mk b/include/gluon.mk
index 0bf92db51..178c6241c 100644
--- a/include/gluon.mk
+++ b/include/gluon.mk
@@ -60,7 +60,7 @@ endef
 
 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 :=
 
-- 
GitLab