Skip to content

Commit 6a0fc5d

Browse files
committed
build: remove unused legacy gzip helpers
Image/Gzip lost its last user with commit df9ffed ("archs38: drop target") and Image/gzip-ext4-padded-squashfs with commit 8dfa38b ("malta: convert to Device macro image building"). The latter also calls Image/Build/gzip, which isn't defined anywhere. Remove both, along with Image/pad-root-squashfs, which was only used by Image/gzip-ext4-padded-squashfs. Link: openwrt/openwrt#25658 Signed-off-by: Paul Spooren <mail@aparcar.org>
1 parent 1b4099f commit 6a0fc5d

1 file changed

Lines changed: 0 additions & 29 deletions

File tree

‎include/image.mk‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,6 @@ define Image/BuildKernel/MkuImage
185185
-n '$(call toupper,$(ARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' -d $(4) $(5)
186186
endef
187187

188-
ifdef CONFIG_TARGET_IMAGES_GZIP
189-
define Image/Gzip
190-
rm -f $(1).gz
191-
gzip -9n $(1)
192-
endef
193-
endif
194-
195-
196188
# Disable noisy checks by default as in upstream
197189
DTC_WARN_FLAGS := \
198190
-Wno-interrupt_provider \
@@ -221,10 +213,6 @@ ifeq ($(DUMP),)
221213
ROOTFS_PARTSIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024)))
222214
endif
223215

224-
define Image/pad-root-squashfs
225-
$(call Image/pad-to,$(KDIR)/root.squashfs,$(if $(1),$(1),$(ROOTFS_PARTSIZE)))
226-
endef
227-
228216
# $(1) source dts file
229217
# $(2) target dtb file
230218
# $(3) extra CPP flags
@@ -357,23 +345,6 @@ ifneq ($(CONFIG_JSON_CYCLONEDX_SBOM),)
357345
endif
358346
endef
359347

360-
define Image/gzip-ext4-padded-squashfs
361-
362-
define Image/Build/squashfs
363-
$(call Image/pad-root-squashfs)
364-
endef
365-
366-
ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
367-
define Image/Build/gzip/ext4
368-
$(call Image/Build/gzip,ext4)
369-
endef
370-
define Image/Build/gzip/squashfs
371-
$(call Image/Build/gzip,squashfs)
372-
endef
373-
endif
374-
375-
endef
376-
377348
ifeq ($(filter-out targz,$(ROOTFS_FILESYSTEM)),)
378349
ifdef CONFIG_TARGET_ROOTFS_TARGZ
379350
define Image/Build/targz

0 commit comments

Comments
 (0)