X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Fimagebuilder%2FMakefile;fp=target%2Fimagebuilder%2FMakefile;h=3ea4f9788cb846314af854c4cf62fea16d3242c6;hb=8909ffc7dd03d663021a3478cf811c304697e4cd;hp=b728ef54be49eb1403243a56cde470a10fbf14d6;hpb=ba86e2f03ba7a6193b0aeb4f0068b07337bb0b7f;p=15.05%2Fopenwrt.git diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index b728ef54be..3ea4f9788c 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -19,13 +19,14 @@ IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))-for-$(PKG 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)) +IB_DTSDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))/arch/$(ARCH)/boot/dts/ all: compile $(BIN_DIR)/$(IB_NAME).tar.bz2: clean rm -rf $(PKG_BUILD_DIR) mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/{host,lib} \ - $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts + $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR) -cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config $(CP) \ $(INCLUDE_DIR) $(SCRIPT_DIR) \ @@ -48,6 +49,9 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean -cp $(LINUX_DIR)/.config $(IB_LDIR)/ -$(SCRIPT_DIR)/bundle-libraries.sh $(IB_LDIR)/scripts/dtc \ $(LINUX_DIR)/scripts/dtc/dtc + if [ -d $(LINUX_DIR)/arch/$(ARCH)/boot/dts ]; then \ + $(CP) $(LINUX_DIR)/arch/$(ARCH)/boot/dts/* $(IB_DTSDIR); \ + fi $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \ | $(XARGS) rm -rf