finally fix the /etc/config/network bug on wgt634u (#214, #215, #219)

[openwrt.git] / target / linux / Makefile

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 8a2eb73..626587b 100644 (file)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,31 +9,31 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
 define kernel_template
 
 $(1)/$(2)-clean:

-       @$(TRACE) target/linux/$(2)-$(1)/clean
+       @$(TRACE) target/linux/$(2)-$(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/$(2)-$(1)/prepare
+       @$(TRACE) target/linux/$(2)-$(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/$(2)-$(1)/compile
+       @$(TRACE) target/linux/$(2)-$(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/$(2)-$(1)/rebuild
+       @$(TRACE) target/linux/$(2)-$(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/$(2)-$(1)/install
+       @$(TRACE) target/linux/$(2)-$(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
+       @$(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
+       @$(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
 


@@ -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
 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


@@ -74,10 +76,10 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:
 endif
 
 prepare:

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

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

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

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