change wget timeout options to --timeout= for compatibility

[openwrt.git] / openwrt / target / Makefile

diff --git a/openwrt/target/Makefile b/openwrt/target/Makefile
index c8baab5..6a1bd95 100644 (file)
--- a/openwrt/target/Makefile
+++ b/openwrt/target/Makefile
@@ -29,20 +29,9 @@ IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
 endif
 endef
 
 endif
 endef
 

-#  Enable loader and prepare kernel
-ifeq ($(strip $(BR2_PACKAGE_LOADER)),y)
-export LINUX_LOADER=$(BUILD_DIR)/lzmaldr
-export LINUX_IMAGE=$(BUILD_DIR)/piggy.lzma
-else
-export LINUX_IMAGE=$(BUILD_DIR)/piggy.gz
-endif
-
-$(BUILD_DIR)/piggy.lzma: $(LINUX_KERNEL)
+$(LINUX_IMAGE): $(LINUX_KERNEL)

        cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)
 
        cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)
 

-$(BUILD_DIR)/piggy.gz: $(LINUX_KERNEL)
-       cat $^ | gzip -c9 $^ > $@ || (rm -f $@ && false)
-

 TARGET_DIRS:=
 TARGET_FS:=
 IMAGE_TARGETS:=
 TARGET_DIRS:=
 TARGET_FS:=
 IMAGE_TARGETS:=


@@ -83,6 +72,7 @@ prepare: $(patsubst %,%-prepare,$(TARGET_DIRS))
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 

+$(INSTALL_TARGET_DIRS): lzma-loader-compile

 compile: $(patsubst %,%-compile,$(TARGET_DIRS))
 install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)
 clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean
 compile: $(patsubst %,%-compile,$(TARGET_DIRS))
 install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)
 clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean