X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5c8a9ed64d4bccdc01eec87d3f8702484fa43a85..be2217a25270dd7b1aa3c7b661a59f27cfcad445:/openwrt/target/linux/Makefile

diff --git a/openwrt/target/linux/Makefile b/openwrt/target/linux/Makefile
index 02ed636d1..4ef6c45a0 100644
--- a/openwrt/target/linux/Makefile
+++ b/openwrt/target/linux/Makefile
@@ -9,31 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	@$(TRACE) target/linux/linux-$(1)/clean
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
+	@$(TRACE) target/linux/$(2)-$(1)-clean
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	@$(TRACE) target/linux/linux-$(1)/prepare
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
+	@$(TRACE) target/linux/$(2)-$(1)-prepare
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	@$(TRACE) target/linux/linux-$(1)/compile
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
+	@$(TRACE) target/linux/$(2)-$(1)-compile
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	@$(TRACE) target/linux/linux-$(1)/rebuild
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
+	@$(TRACE) target/linux/$(2)-$(1)-rebuild
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	@$(TRACE) target/linux/linux-$(1)/install
-	$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
+	@$(TRACE) target/linux/$(2)-$(1)-install
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-	@$(TRACE) target/linux/image/install
+	@$(TRACE) target/linux/image-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
-	@$(TRACE) target/linux/image/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
 
@@ -45,6 +45,8 @@ compile: $(1)/$(2)-compile
 rebuild: $(1)/$(2)-rebuild
 $(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
 install-ib: $(1)/$(2)-install-ib
+package/%:
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" $$@
 endif
 
 .PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
@@ -58,13 +60,13 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 	rm -rf $(IB_DIR)
 	mkdir -p $(IB_DIR)/packages
 	mkdir -p $(IB_DIR)/scripts
-	cp -fpR ./imagebuilder/* $(IB_DIR)/
-	cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
-	cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
+	$(CP) ./imagebuilder/* $(IB_DIR)/
+	$(CP) $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
+	$(CP) $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
 	$(MAKE) install-ib
-	cp $(TOPDIR)/rules.mk $(IB_DIR)
-	cp -fpR ./image $(IB_DIR)/
-	cp $(TOPDIR)/.config $(IB_DIR)/
+	$(CP) $(TOPDIR)/rules.mk $(IB_DIR)
+	$(CP) ./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)
@@ -74,10 +76,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:
-	@$(TRACE) target/linux/image/prepare
+	@$(TRACE) target/linux/image-prepare
 	$(MAKE) -C image prepare
 compile:
-	@$(TRACE) target/linux/image/compile
+	@$(TRACE) target/linux/image-compile
 	$(MAKE) -C image compile
 install:
 rebuild:
@@ -88,3 +90,5 @@ $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
 $(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))
+$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
+$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))