[OpenWrt-Devel] [PATCH] image: ignore usign build errors

[Hauke Mehrtens]

On 10/05/2018 12:09 PM, Felix Fietkau wrote:
> On 2018-10-02 22:50, Hauke Mehrtens wrote:
>> The tl-wa850re-v2 images from the ar71xx/tiny target are getting too big
>> with the default packages. The size check is done before the meta data
>> is added so there is no file to add meta data to or to sign. Originally
>> errors in Build/append-metadata were getting ignored, but if the signing
>> fails the error is not ignored.
>> This patch makes make ignore errors in the signing which is the case for
>> too big images because then the needed file is not created in the
>> previous process.
>>
>> Fixes: 848b455d2e94 ("image: use ucert to append signature")
>> Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
>> ---
>>  include/image-commands.mk | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/image-commands.mk b/include/image-commands.mk
>> index ae01706b14..9f5876bccd 100644
>> --- a/include/image-commands.mk
>> +++ b/include/image-commands.mk
>> @@ -332,7 +332,7 @@ metadata_json = \
>>  
>>  define Build/append-metadata
>>  	$(if $(SUPPORTED_DEVICES),-echo $(call metadata_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@)
>> -	[ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" ] || { \
>> +	-[ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" ] || { \
> 
> How about this instead?
> 
> [ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" -o ! -s "$@" ] || ...
> 
> - Felix
> 
Hi Felix,

Thanks, I changed to patch to do it like you suggested and just check if
the file exists.

Hauke

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20181007/e0f7712b/attachment.sig>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel