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 038983f..46b162c 100644 (file)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,36 +9,29 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
 define kernel_template
 
 $(1)/$(2)-clean:

-       @$(TRACE) target/linux/linux-$(1)/clean

        $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
        $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:

-       @$(TRACE) target/linux/linux-$(1)/prepare

        $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
        $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:

-       @$(TRACE) target/linux/linux-$(1)/compile

        $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
        $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:

-       @$(TRACE) target/linux/linux-$(1)/rebuild

        $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
        $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:

-       @$(TRACE) target/linux/linux-$(1)/install

        $(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
        $(MAKE) -C $(2)-$(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:
        $(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
 
 
        $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" 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
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile


@@ -58,26 +51,24 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
        rm -rf $(IB_DIR)
        mkdir -p $(IB_DIR)/packages
        mkdir -p $(IB_DIR)/scripts
        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
        $(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)
 
        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
 
 prepare:
 install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:

-       @$(TRACE) target/linux/image/prepare

        $(MAKE) -C image prepare
 compile:
        $(MAKE) -C image prepare
 compile:

-       @$(TRACE) target/linux/image/compile

        $(MAKE) -C image compile
 install:
 rebuild:
        $(MAKE) -C image compile
 install:
 rebuild:


@@ -89,3 +80,7 @@ $(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,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))