X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/960b21b516f519374168ee3703c8dd034c147843..3c4b0a87416877873cd555624ec19122ed271b30:/target/linux/Makefile?ds=sidebyside

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 610bc7e1b..02ed636d1 100644
--- 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
 
@@ -36,11 +43,11 @@ clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
-install: $(1)/$(2)-image
+$(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
 install-ib: $(1)/$(2)-install-ib
 endif
 
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-install-ib
+.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
 endef
 
 .PHONY: clean prepare compile rebuild install imagebuilder install-ib
@@ -51,13 +58,14 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 	rm -rf $(IB_DIR)
 	mkdir -p $(IB_DIR)/packages
 	mkdir -p $(IB_DIR)/scripts
-	cp -dpR ./imagebuilder/* $(IB_DIR)/
-	cp -dpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
+	cp -fpR ./imagebuilder/* $(IB_DIR)/
+	cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
 	cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
 	$(MAKE) install-ib
 	cp $(TOPDIR)/rules.mk $(IB_DIR)
-	cp -dpR ./image $(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,4 +85,6 @@ 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))
+$(eval $(call kernel_template,2.6,x86,2_6_X86))