From fc6ed9521dca405da0a4f93bec504fd497ccf1fe Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 14 Dec 2016 17:10:52 +0100 Subject: [PATCH] brcm63xx: image: trim revision code used for --rsa-signature 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 --- target/linux/brcm63xx/image/bcm63xx.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index 34d496e928..ce03f7b700 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -922,7 +922,7 @@ define Device/NEUFBOX4-SER DEVICE_DTS := nb4-ser-r0 CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 - CFE_EXTRAS += --rsa-signature "LEDE-$(REVISION)" + CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))" DEVICE_PACKAGES := \ $(B43_PACKAGES) $(USB2_PACKAGES) endef @@ -934,7 +934,7 @@ define Device/NEUFBOX4-FXC DEVICE_DTS := nb4-fxc-r1 CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 - CFE_EXTRAS += --rsa-signature "LEDE-$(REVISION)" + CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))" DEVICE_PACKAGES := \ $(B43_PACKAGES) $(USB2_PACKAGES) endef @@ -946,7 +946,7 @@ define Device/NEUFBOX6 DEVICE_DTS := nb6-ser-r0 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 - CFE_EXTRAS += --rsa-signature "LEDE-$(REVISION)" + CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))" DEVICE_PACKAGES := \ $(B43_PACKAGES) $(USB2_PACKAGES) endef