From 3071e8dd49687abc9b6033ce1030c54a05af8ffd Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 11 Sep 2013 22:41:49 +0200 Subject: [PATCH] Fix package list generation I honestly have no idea how this broke, but I suspect it has to do with the make version... --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0f7e86ea..c7728966 100644 --- a/Makefile +++ b/Makefile @@ -86,10 +86,6 @@ endef include $(GLUONDIR)/include/profiles.mk -# Generate package lists -$(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)) - $(BUILD_DIR)/.prepared: Makefile @mkdir -p $$(dirname $@) @@ -200,6 +196,7 @@ OPKG:= \ EnableInitscript = ! grep -q '\#!/bin/sh /etc/rc.common' $(1) || bash ./etc/rc.common $(1) enable FileOrigin = $(firstword $(shell $(OPKG) search $(1))) + enable_initscripts: FORCE cd $(TARGET_DIR) && ( export IPKG_INSTROOT=$(TARGET_DIR); \ $(foreach script,$(wildcard $(TARGET_DIR)/etc/init.d/*), \ @@ -207,6 +204,11 @@ enable_initscripts: FORCE ) : \ ) + +# Generate package lists +$(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)) + package_install: FORCE $(OPKG) update $(OPKG) install $(PACKAGE_DIR)/libc_*.ipk