From e57bcd229a2019dea194500e90d0f78e6c59e4ec Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Wed, 25 Oct 2023 12:15:12 +0200 Subject: [PATCH] ath79: image: use sysupgrade-tar for SR71 / PB42 As the combined-image stanza is now retired, use sysupgrade-tar for the sysupgrade images. Signed-off-by: Zoltan HERPAI --- target/linux/ath79/image/generic-ubnt.mk | 3 +-- target/linux/ath79/image/generic.mk | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 080acb3d32..80d7e351f0 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -343,8 +343,7 @@ define Device/ubnt_sr71 IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \ - append-metadata | check-size + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb UBNT_BOARD := LS-SR71 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 2c5bfc3d59..9473b4a830 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -587,8 +587,7 @@ define Device/atheros_pb42 IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | \ - append-metadata | check-size + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) SUPPORTED_DEVICES += pb42 endef -- 2.30.2