X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bca7ac77bf1981587e65d397ab25a7a6f3cc35ad..8d00d695a0bffe507b4fc507ca037d83c0c93665:/target/imagebuilder/Makefile diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 9b3700ece..30083999e 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -1,43 +1,52 @@ # -# 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 include $(INCLUDE_DIR)/host.mk +override MAKEFLAGS= + PKG_OS:=$(shell uname -s) -PKG_CPU:=$(shell uname -m) +PKG_CPU:=$(shell uname -m | sed "s/ //g") -IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU) -IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME) +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 $(IB_BUILD_DIR) - mkdir -p $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin $(IB_BUILD_DIR)/target/linux + rm -rf $(PKG_BUILD_DIR) + 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) $(PACKAGE_DIR) \ - $(TOPDIR)/rules.mk $(TOPDIR)/.config \ - $(TMP_DIR)/.target.mk \ - $(TMP_DIR)/.packageinfo \ - $(TMP_DIR)/.targetinfo \ + $(INCLUDE_DIR) $(SCRIPT_DIR) \ + $(TOPDIR)/rules.mk \ ./files/Makefile \ - $(IB_BUILD_DIR)/ - $(CP) $(STAGING_DIR)/bin/* $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin - $(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux - rm -rf $(IB_BUILD_DIR)/target/linux/*/patches - -cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/* $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) # don't copy subdirectories here - find $(IB_BUILD_DIR) -name .svn | $(XARGS) rm -rf - find $(IB_BUILD_DIR) -name CVS | $(XARGS) rm -rf - (cd $(BUILD_DIR); \ - tar cfj $@ $(IB_NAME); \ - ) + ./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) $(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/*/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 + $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@ download: prepare: @@ -45,4 +54,4 @@ compile: $(BIN_DIR)/$(IB_NAME).tar.bz2 install: compile clean: FORCE - rm -rf $(IB_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2 + rm -rf $(PKG_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2