kernel: add two missing config symbols for 3.1

[openwrt.git] / target / imagebuilder / Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index e0b64ea..3008399 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -17,19 +17,24 @@ 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_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)
 
 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) \
        $(CP) \
                $(INCLUDE_DIR) $(SCRIPT_DIR) \

-               $(TOPDIR)/rules.mk $(TOPDIR)/.config \
+               $(TOPDIR)/rules.mk \

                ./files/Makefile \
                ./files/Makefile \

+               ./files/repositories.conf \

                $(TMP_DIR)/.targetinfo \
                $(TMP_DIR)/.packageinfo \
                $(PKG_BUILD_DIR)/
                $(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/
        $(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/


@@ -37,6 +42,7 @@ $(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
                $(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
        echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
        find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
          | $(XARGS) rm -rf