KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm63xx: image: trim revision code used for --rsa-signature

Browse source 
The imagetag RSA signature field may not exceed 20 characters, so trim the
Git hash portion from the REVISION variable in order to ensure that the
resulting string fits within this field.

The current revision values may be longer than 20 chars, especially when
building within a dirty tree. In this case, the revision will look like
"r2435+75-b4aa3c8" which, combined with the "LEDE-" prefix, is 21 chars long.

Fixes the following error spotted by the buildbots:

    Error: RSA Signature (rsa_signature,r) too long.
    make[4]: *** [.../lede-brcm63xx-generic-NEUFBOX6-squashfs-cfe.bin] Error 1

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-12-14 17:10:52 +01:00
parent b4aa3c899c
commit fc6ed9521d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/brcm63xx/image/bcm63xx.mk
View file

@ -922,7 +922,7 @@ define Device/NEUFBOX4-SER
DEVICE_DTS := nb4-ser-r0 DEVICE_DTS := nb4-ser-r0
CFE_BOARD_ID := 96358VW CFE_BOARD_ID := 96358VW
CFE_CHIP_ID := 6358 CFE_CHIP_ID := 6358
CFE_EXTRAS += --rsa-signature "LEDE-$(REVISION)" CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef
@ -934,7 +934,7 @@ define Device/NEUFBOX4-FXC
DEVICE_DTS := nb4-fxc-r1 DEVICE_DTS := nb4-fxc-r1
CFE_BOARD_ID := 96358VW CFE_BOARD_ID := 96358VW
CFE_CHIP_ID := 6358 CFE_CHIP_ID := 6358
CFE_EXTRAS += --rsa-signature "LEDE-$(REVISION)" CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef
@ -946,7 +946,7 @@ define Device/NEUFBOX6
DEVICE_DTS := nb6-ser-r0 DEVICE_DTS := nb6-ser-r0
CFE_BOARD_ID := NB6-SER-r0 CFE_BOARD_ID := NB6-SER-r0
CFE_CHIP_ID := 6362 CFE_CHIP_ID := 6362
CFE_EXTRAS += --rsa-signature "LEDE-$(REVISION)" CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef