summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/ext2/ext2root.mk12
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)))