fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ar71xx/image: use short VERSION_DIST

Browse Source 
Workaround for max 14 chars limitation.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 5e66ed82a8)
This commit is contained in:
Tianling Shen 2022-04-14 11:00:49 +08:00
parent 47eb06821f
commit 4ecb47fd90
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/image/generic.mk
View File

@ -28,7 +28,7 @@ define Build/mkdapimg2
$(STAGING_DIR_HOST)/bin/mkdapimg2 \
-i $@ -o $@.new \
-s $(DAP_SIGNATURE) \
-v EMORTAL-$(firstword $(subst +, ,$(firstword $(subst -, ,$(REVISION))))) \
-v Emortal-$(firstword $(subst +, ,$(firstword $(subst -, ,$(REVISION))))) \
-r Default \
$(if $(1),-k $(1))
mv $@.new $@

4
target/linux/ar71xx/image/legacy.mk
View File

@ -486,11 +486,11 @@ define Image/Build/Belkin
$(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
$(call Sysupgrade/RKuImage,$(1),$(2),$(kernsize),$(rootsize))
if [ -e "$(call sysupname,$(1),$(2))" ]; then \
edimax_fw_header -m $(5) -v "$(shell echo -n $(VERSION_DIST)$(REVISION) | cut -c -13)" \
edimax_fw_header -m $(5) -v "$(shell echo -n Emortal$(REVISION) | cut -c -13)" \
-n "uImage" \
-i $(KDIR_TMP)/vmlinux-$(2).uImage \
-o $(KDIR_TMP)/$(2)-uImage; \
edimax_fw_header -m $(5) -v "$(shell echo -n $(VERSION_DIST)$(REVISION) | cut -c -13)" \
edimax_fw_header -m $(5) -v "$(shell echo -n Emortal$(REVISION) | cut -c -13)" \
-n "rootfs" \
-i $(KDIR)/root.$(1) \
-o $(KDIR_TMP)/$(2)-rootfs; \