aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/image
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-05-21 15:22:00 +0200
committerJohn Crispin <john@phrozen.org>2018-05-24 17:24:30 +0200
commit9e4f4e1a1fe4e556ca608782d3eb1ca7e46fa7b2 (patch)
treef52a26f5af9f15330eb8902bb6c4d850206b8b90 /target/linux/ar71xx/image
parent8f2ac5c085ecfe6976047156f7726a10db4556eb (diff)
downloadupstream-9e4f4e1a1fe4e556ca608782d3eb1ca7e46fa7b2.tar.gz
upstream-9e4f4e1a1fe4e556ca608782d3eb1ca7e46fa7b2.tar.bz2
upstream-9e4f4e1a1fe4e556ca608782d3eb1ca7e46fa7b2.zip
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 <hauke@hauke-m.de> (cherry picked from commit ae8ff1c65c4ea4e0b2e1e8ef94fad87587d979bc)
Diffstat (limited to 'target/linux/ar71xx/image')
-rw-r--r--target/linux/ar71xx/image/generic.mk2
1 files changed, 1 insertions, 1 deletions
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 $@