X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0a2707a01ad7344a240d728a414ae32169ac3295..43284ece33d7dbe5d8465fdd30e9ed37a5986ed3:/target/linux/Makefile

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 4c17a5788..46b162c7e 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,19 +9,19 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" clean
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" prepare
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" compile
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" rebuild
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	$(MAKE) -C linux-$(1) BOARD="$(2)" install
+	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
@@ -31,7 +31,7 @@ $(1)/$(2)-install-ib:
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
 
-ifeq ($(BR2_LINUX_$(3)),y)
+ifeq ($(CONFIG_LINUX_$(3)),y)
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
@@ -51,17 +51,18 @@ $(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 $(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 -dpR ./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)
 
-ifeq ($(BR2_PACKAGE_IMAGEBUILDER),y)
+ifeq ($(CONFIG_PACKAGE_IMAGEBUILDER),y)
 install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
@@ -75,4 +76,11 @@ 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))
+$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
+$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
+$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
+$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
+$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))