X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/67f09fa245578c136ac34804dad41f1e1d694e48..e6839c59a8edf27ed7d4a80092c4201cc8208878:/target/imagebuilder/files/Makefile diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 0590dfa72..002274aca 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -42,6 +42,7 @@ Building images: make image PROFILE="" # override the default target profile make image PACKAGES=" [ [ ...]]" # include extra packages make image FILES="" # include extra files from + make image BIN_DIR="" # alternative output directory for the images endef $(eval $(call shexport,Helptext)) @@ -58,10 +59,15 @@ OPKG:= \ IPKG_CONF_DIR="$(TOPDIR)/tmp" \ IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ $(STAGING_DIR_HOST)/bin/opkg \ - -f $(TOPDIR)/tmp/opkg.conf \ + -f $(TOPDIR)/repositories.conf \ --force-depends \ --force-overwrite \ - --force-run-hooks + --force-postinstall \ + --cache $(TOPDIR)/dl \ + --offline-root $(TARGET_DIR) \ + --add-dest root:/ \ + --add-arch all:100 \ + --add-arch $(ARCH_PACKAGES):200 define Profile $(eval $(call Profile/Default)) @@ -83,11 +89,6 @@ _call_info: FORCE echo 'Available Profiles:' echo; $(PROFILE_LIST) -$(TOPDIR)/tmp/opkg.conf: FORCE - @mkdir -p $(TOPDIR)/tmp - @mkdir -p $(TARGET_DIR)/tmp - @$(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)) @@ -107,10 +108,11 @@ endif $(MAKE) package_postinst $(MAKE) build_image -package_index: $(TOPDIR)/tmp/opkg.conf FORCE +package_index: FORCE @echo @echo Building package index... - (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ + @mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp + (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \ gzip -9c Packages > Packages.gz \ ) >/dev/null 2>/dev/null $(OPKG) update @@ -145,7 +147,7 @@ build_image: FORCE $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 clean: - rm -rf tmp $(TARGET_DIR) $(BIN_DIR) + rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR) info: @@ -156,7 +158,8 @@ image: $(MAKE) _call_image \ $(if $(PROFILE),USER_PROFILE="$(PROFILE)") \ $(if $(FILES),USER_FILES="$(FILES)") \ - $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)")) + $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \ + $(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)")) .SILENT: help info image