From 67f09fa245578c136ac34804dad41f1e1d694e48 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 8 Sep 2010 00:36:35 +0000 Subject: [imagebuilder] - add a helper script to generate opkg.conf, attempt to detect package architecture from packages/ - fix package defaults when no package override is given, IB previously aggregated the defautls of all profiles - introduce a repositories.conf, allows using remote opkg repositories in imagebuilder git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22978 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/imagebuilder/files/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'target/imagebuilder/files/Makefile') diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 8e6c6d746..0590dfa72 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -86,19 +86,12 @@ _call_info: FORCE $(TOPDIR)/tmp/opkg.conf: FORCE @mkdir -p $(TOPDIR)/tmp @mkdir -p $(TARGET_DIR)/tmp - @echo 'dest root /' > $@ - @echo 'src packages file:$(PACKAGE_DIR)' >> $@ - @echo 'arch all 100' >> $@ -ifneq ($(CONFIG_TARGET_adm5120),y) - @echo 'arch $(BOARD) 200' >> $@ -else - @echo 'arch $(BOARD)_$(ARCH) 200' >> $@ -endif - @echo 'option offline_root $(TARGET_DIR)' >> $@ + @$(TOPDIR)/scripts/opkg-generate-config.sh $(TARGET_DIR) BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel) # "-pkgname" in the package list means remove "pkgname" from the package list BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) +PACKAGES:= _call_image: echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))' -- cgit v1.2.3