From: Hauke Mehrtens Date: Mon, 21 May 2018 13:22:00 +0000 (+0200) Subject: ar71xx: Fix build for dap-1330-a1 board X-Git-Tag: v19.07.0-rc1~3681 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae8ff1c65c4ea4e0b2e1e8ef94fad87587d979bc;p=oweals%2Fopenwrt.git ar71xx: Fix build for dap-1330-a1 board Using a version number of 16 character causes a buffer overflow in the version number overwriting the first bit of the signature in the mkdapimg2 tool. I am not sure if the version number should be null terminated or not. This patch reduces the size of the version number by removing the number of private commits from it. This was the original version number which caused problems: OpenWrt-r6727+10 Now it uses this version number: OpenWrt-r6727 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index a0f6326145..020e01f85a 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -36,7 +36,7 @@ define Build/mkdapimg2 $(STAGING_DIR_HOST)/bin/mkdapimg2 \ -i $@ -o $@.new \ -s $(DAP_SIGNATURE) \ - -v $(VERSION_DIST)-$(firstword $(subst -, ,$(REVISION))) \ + -v $(VERSION_DIST)-$(firstword $(subst +, ,$(firstword $(subst -, ,$(REVISION))))) \ -r Default \ $(if $(1),-k $(1)) mv $@.new $@