move target/linux/package/switch to package/, fix a bug in the ipkg dependency handling

[openwrt.git] / target / linux / Makefile

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 7922de9..46b162c 100644 (file)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -31,15 +31,13 @@ $(1)/$(2)-install-ib:
        echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
 
        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
 rebuild: $(1)/$(2)-rebuild
 $(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
 install-ib: $(1)/$(2)-install-ib
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 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
 endif
 
 .PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib


@@ -64,7 +62,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
        find $(IB_DIR) -name CVS | xargs rm -rf
        (cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
 
        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
 
 install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 


@@ -84,3 +82,5 @@ $(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.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))