X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d895ddd832c3cd3b0007c276b1969d6e524d0d47..ef9af38783319991e08012f31da54910a9517f25:/target/imagebuilder/Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 607b79be0..923c1e94b 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -1,19 +1,20 @@
 # 
-# 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 | sed "s/ //g")
 
-IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
+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))
 
@@ -23,12 +24,13 @@ $(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
 	$(CP) \
-		$(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
+		$(INCLUDE_DIR) $(SCRIPT_DIR) \
 		$(TOPDIR)/rules.mk $(TOPDIR)/.config \
 		./files/Makefile \
 		$(TMP_DIR)/.targetinfo \
 		$(TMP_DIR)/.packageinfo \
 		$(PKG_BUILD_DIR)/
+	$(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) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
@@ -36,6 +38,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
 		$(PKG_BUILD_DIR)/target/linux/*/patches \
 		$(PKG_BUILD_DIR)/target/linux/*/*/patches
 	-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
+	echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
 	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