backport base-files fix from whiterussian [2308],

[openwrt.git] / target / linux / Makefile

diff --git a/target/linux/Makefile b/target/linux/Makefile
index e9edba2..7949994 100644 (file)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,24 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" clean
+       @$(TRACE) target/linux/linux-$(1)/clean
+       $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" prepare
+       @$(TRACE) target/linux/linux-$(1)/prepare
+       $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" compile
+       @$(TRACE) target/linux/linux-$(1)/compile
+       $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" rebuild
+       @$(TRACE) target/linux/linux-$(1)/rebuild
+       $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" install
+       @$(TRACE) target/linux/linux-$(1)/install
+       $(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
+       @$(TRACE) target/linux/image/install
        $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
+       @$(TRACE) target/linux/image/install-ib
        $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
        echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
@@ -58,6 +65,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
        cp $(TOPDIR)/rules.mk $(IB_DIR)
        cp -fpR ./image $(IB_DIR)/
        cp $(TOPDIR)/.config $(IB_DIR)/
+       find $(IB_DIR) -name .svn | xargs rm -rf
        find $(IB_DIR) -name CVS | xargs rm -rf
        (cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
 
@@ -66,8 +74,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:
+       @$(TRACE) target/linux/image/prepare
        $(MAKE) -C image prepare
 compile:
+       @$(TRACE) target/linux/image/compile
        $(MAKE) -C image compile
 install:
 rebuild:
@@ -75,5 +85,5 @@ clean:
 
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
-$(eval $(call kernel_template,2.4,soekris,2_4_SOEKRIS))
+$(eval $(call kernel_template,2.4,x86,2_4_X86))
 $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))