From 900330ff2f5cb568ff3631ebea2888956e2ed8c9 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Fri, 23 Aug 2019 15:50:47 +0200 Subject: [PATCH] ath79: image: retire combined-image for Adtran/Bluesocket devices During review it slipped by that these devices use combined-image which should never be used for newly added ones. Therefore switch to sysupgrade-tar generated images introduced in 8f6f260 ("ath79: routerstation: prepare to use sysupgrade-tar format image"). The sysupgrade accepts both images for now so no reression should occur. Cc: Brian Gonyer Cc: Daniel Gimpelevich Signed-off-by: Tomasz Maciej Nowak --- target/linux/ath79/image/generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index eed0e2b683..fe80be980c 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -108,7 +108,7 @@ define Device/adtran_bsap1880 IMAGES += kernel.bin rootfs.bin IMAGE/kernel.bin := append-kernel | pad-to $$$$(BLOCKSIZE) IMAGE/rootfs.bin := append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata endef define Device/adtran_bsap1800-v2 -- 2.30.2