cns21xx: remove 3.2 support

[openwrt.git] / target / imagebuilder / Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 9e9afb2b273cfec3859bee6fac218c8ea874de23..686a175065697f97787292723f2f1c48f70ce8a6 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,6 +8,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/version.mk
 
 override MAKEFLAGS=
 
@@ -17,12 +18,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 +35,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/
+       $(VERSION_SED) $(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,7 +43,8 @@ $(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
-       echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
+       -cp $(LINUX_DIR)/.config $(IB_LDIR)/
+       $(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
        $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@