X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ac9bdf20c8c0e8f419cff3061aa1e3459c6c4e1e..8d00d695a0bffe507b4fc507ca037d83c0c93665:/target/imagebuilder/Makefile diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 12e391ef9..30083999e 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -1,10 +1,9 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 6070 2007-01-10 21:21:59Z nbd $ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk @@ -18,30 +17,35 @@ 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 $(PKG_BUILD_DIR)/target + 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) \ $(INCLUDE_DIR) $(SCRIPT_DIR) \ - $(TOPDIR)/rules.mk $(TOPDIR)/.config \ + $(TOPDIR)/rules.mk \ ./files/Makefile \ + ./files/repositories.conf \ $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ $(PKG_BUILD_DIR)/ + $(SED) 's/$$A/$(BOARD)/' $(PKG_BUILD_DIR)/repositories.conf $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages - $(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/ - $(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/ + $(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/ $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ rm -rf \ - $(PKG_BUILD_DIR)/target/linux/*/patches \ - $(PKG_BUILD_DIR)/target/linux/*/*/patches + $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \ + $(PKG_BUILD_DIR)/target/linux/*/patches{,-*} -cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here - find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf - find $(PKG_BUILD_DIR) -name CVS | $(XARGS) rm -rf - find $(PKG_BUILD_DIR) -name .git | $(XARGS) rm -rf + -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 $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@ download: