diff --git a/config/Config-images.in b/config/Config-images.in index a62e3514aaa..7cc3225182e 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -332,7 +332,7 @@ menu "Target Images" config TARGET_IMAGES_GZIP bool "GZip images" - depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armsr || TARGET_malta || TARGET_loongarch64 + depends on TARGET_x86 || TARGET_armsr || TARGET_malta || TARGET_loongarch64 default y comment "Image Options" diff --git a/include/image.mk b/include/image.mk index 808232536f9..5b14f6b05f6 100644 --- a/include/image.mk +++ b/include/image.mk @@ -737,12 +737,11 @@ define Device/Build/kernel endef define Device/Build/image - GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz)) $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \ $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \ - $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX)) + $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))) $(eval $(call Device/Export,$(KDIR)/tmp/$(call DEVICE_IMG_NAME,$(1),$(2)),$(1))) - $(3)-images: $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX) + $(3)-images: $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2)) ROOTFS/$(1)/$(3) := \ $(KDIR)/root.$(1)$$(strip \ @@ -760,13 +759,10 @@ define Device/Build/image .IGNORE: $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2)) - $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2)).gz: $(KDIR)/tmp/$(call DEVICE_IMG_NAME,$(1),$(2)) - gzip -c -9n $$^ > $$@ - $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2)): $(KDIR)/tmp/$(call DEVICE_IMG_NAME,$(1),$(2)) cp $$^ $$@ - $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json: $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX) + $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json: $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2)) @mkdir -p $$(shell dirname $$@) DEVICE_ID="$(DEVICE_NAME)" \ SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \