From ed552b5294fbd8f862d18fb308138fecc6b06506 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 20 Feb 2013 13:28:07 +0100 Subject: [PATCH] Correctly handle OpenWRT profile package list (with negative selection) --- builder/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builder/Makefile b/builder/Makefile index 88d64552..5a160dc1 100644 --- a/builder/Makefile +++ b/builder/Makefile @@ -68,7 +68,8 @@ endef include $(GLUONDIR)/profiles.mk -# Generate Gluon package list +# Generate package list s +$(eval $(call merge-lists,BASE_PACKAGES,DEFAULT_PACKAGES $(PROFILE)_PACKAGES)) $(eval $(call merge-lists,GLUON_PACKAGES,GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_$(PROFILE)_DEFAULT_PACKAGES GLUON_$(PROFILE)_SITE_PACKAGES)) include $(INCLUDE_DIR)/image.mk @@ -97,7 +98,7 @@ package_install: FORCE $(OPKG) install $(PACKAGE_DIR)/libc_*.ipk $(OPKG) install $(PACKAGE_DIR)/kernel_*.ipk - $(OPKG) install $(DEFAULT_PACKAGES) $($(PROFILE)_PACKAGES) + $(OPKG) install $(BASE_PACKAGES) $(NO_TRACE_MAKE) enable_initscripts ENABLE_INITSCRIPTS_FROM=% $(OPKG) install $(GLUON_PACKAGES)