X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2FMakefile;h=c3d99b6526084855c19a5194eb1fb469763f598b;hb=08479c3ef6123d8b8156fd8e5e9c1763216e0503;hp=c8baab5f7ab658e859ecaa71ac290b8445dca154;hpb=21db875713e9dab2d6560f121b8e856fd182a773;p=openwrt-10.03%2F.git diff --git a/target/Makefile b/target/Makefile index c8baab5f7..c3d99b652 100644 --- a/target/Makefile +++ b/target/Makefile @@ -29,20 +29,9 @@ IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin 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) -$(BUILD_DIR)/piggy.gz: $(LINUX_KERNEL) - cat $^ | gzip -c9 $^ > $@ || (rm -f $@ && false) - TARGET_DIRS:= TARGET_FS:= IMAGE_TARGETS:= @@ -83,7 +72,9 @@ prepare: $(patsubst %,%-prepare,$(TARGET_DIRS)) $(BIN_DIR): mkdir -p $(BIN_DIR) -compile: $(patsubst %,%-compile,$(TARGET_DIRS)) +$(INSTALL_TARGET_DIRS): lzma-loader-compile +$(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS)) +compile: $(patsubst %,%-compile,jffs2 squashfs-lzma lzma-loader) install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS) clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean