X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/67f09fa245578c136ac34804dad41f1e1d694e48..63abf5ef7dd9a82018aab5780dd289d996e4e6d5:/target/imagebuilder/Makefile diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 9e9afb2b2..30083999e 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -17,12 +17,13 @@ PKG_CPU:=$(shell uname -m | sed "s/ //g") IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU) PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME) IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR)) +IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR)) all: compile $(BIN_DIR)/$(IB_NAME).tar.bz2: clean rm -rf $(PKG_BUILD_DIR) - mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host \ + mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host \ $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts -cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config $(CP) \ @@ -33,7 +34,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ $(PKG_BUILD_DIR)/ - $(CP) ./files/opkg-generate-config.sh $(PKG_BUILD_DIR)/scripts/ + $(SED) 's/$$A/$(BOARD)/' $(PKG_BUILD_DIR)/repositories.conf $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages $(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/ $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ @@ -41,6 +42,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \ $(PKG_BUILD_DIR)/target/linux/*/patches{,-*} -cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here + -cp $(LINUX_DIR)/.config $(IB_LDIR)/ echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \ | $(XARGS) rm -rf