[PATCH] ath79: restore sysupgrade support for ja76pf2 and routerstations

[Tomasz Maciej Nowak]

Hi.

W dniu 01.12.2020 o 20:09, Adrian Schmutzler pisze:
> Hi,
> 
>> -----Original Message-----
>> From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org]
>> On Behalf Of Tomasz Maciej Nowak
>> Sent: Dienstag, 1. Dezember 2020 18:30
>> To: openwrt-devel at lists.openwrt.org
>> Subject: [PATCH] ath79: restore sysupgrade support for ja76pf2 and
>> routerstations
>>
>> Because the bug described in FS#2428 has been fixed with bf2870c
>> ("kernel: fix mtd partition erase < parent_erasesize writes") these devices
>> can now safely do sysupgrade. Restore sysupgrade support disabled
>> in:
>> 0cc87b3 ("ath79: image: disable sysupgrade images for routerstations and
>> ja76pf2")
>> and
>> cc5256a ("ath79: base-files: disable sysupgrade for routerstations and
>> ja76pf2")
> 
> I'm merging this one with a few minor adjustments.
> 
>> +define Build/combined-image
>> +	sh $(TOPDIR)/scripts/combined-image.sh \
>> +		"$(IMAGE_KERNEL)" \
>> +		"$@" \
>> +		"$@.new"
>> +	@mv $@.new $@
>> +endef
> 
> I wonder whether we can merge this with the similar function from ath25 and put it back into image-commands.mk.
> The only difference seems that ath25 uses the $(IMAGE_ROOTFS) argument, while we use the rootfs set up in $@.
> 
> Do you have an opinion on that?

I'm fine with using that command and moving it to image.mk. I'm planing to move both ja76pf2 and routerstations images to use sysupgrade-tar, after first ath79-only stable release, so I don't know if we should bother moving the combine-image command.

> 
> Best
> 
> Adrian 
> 

Regards

-- 
TMN