diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-12-20 16:45:47 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-12-20 16:45:47 +0000 |
| commit | af9f612b672892b20e0069f1251bf0648c38c1e4 (patch) | |
| tree | 9a82a00fa1b6b76cd3f9a5bc3ab3e76ee697d065 | |
| parent | b07203d446c9d6d99f1385c632f1f280b2f49df3 (diff) | |
- Lars Munch noticed that i broke the ext2 compressor. Thanks!
| -rw-r--r-- | target/ext2/ext2root.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 696641330..95a9b61cb 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -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))) |