- Lars Munch noticed that i broke the ext2 compressor. Thanks!
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 20 Dec 2006 16:45:47 +0000 (16:45 -0000)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Wed, 20 Dec 2006 16:45:47 +0000 (16:45 -0000)
target/ext2/ext2root.mk

index 69664133048734a2299464b8f638a05f701de88c..95a9b61cb67993dfc828c0aabcfcc1428ae996bb 100644 (file)
@@ -61,8 +61,6 @@ endif
 EXT2_BASE :=   $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT))
 #")
 
-EXT2_TARGET := $(EXT2_BASE)
-
 EXT2_ROOTFS_COMPRESSOR:=
 EXT2_ROOTFS_COMPRESSOR_EXT:=
 EXT2_ROOTFS_COMPRESSOR_PREREQ:=
@@ -82,6 +80,12 @@ EXT2_ROOTFS_COMPRESSOR_EXT:=lzma
 EXT2_ROOTFS_COMPRESSOR_PREREQ:= lzma-host
 endif
 
+ifneq ($(EXT2_ROOTFS_COMPRESSOR),)
+EXT2_TARGET := $(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT)
+else
+EXT2_TARGET := $(EXT2_BASE)
+endif
+
 $(EXT2_BASE): host-fakeroot makedevs genext2fs
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
        @rm -rf $(TARGET_DIR)/usr/man
@@ -116,8 +120,8 @@ endif
        -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 
 ifneq ($(EXT2_ROOTFS_COMPRESSOR),)
-$(EXT2_TARGET).(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE)
-       $(EXT2_ROOTFS_COMPRESSOR) $(EXT2_TARGET) > $(EXT2_TARGET).$(EXT2_ROOTFS_COMPRESSOR_EXT)
+$(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE)
+       $(EXT2_ROOTFS_COMPRESSOR) $(EXT2_BASE) > $(EXT2_TARGET)
 endif
 
 EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)))