domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

realtek: fix ZyXEL initramfs image generation

Browse Source 
The current rule produces empty trailers, causing the OEM firmware
update application to reject our images.

The double expansion of a makefile variable does not work inside
shell code.  The second round is interpreted as a shell expansion,
attempting to run the command ZYXEL_VERS instead of expanding the
$(ZYXEL_VERS) makefile variable.

Fix by removing one level of variable indirection.

Fixes: c6c8d597e1 ("realtek: Add generic zyxel_gs1900 image definition")
Tested-by: Sander Vanheule <sander@svanheule.net>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
This commit is contained in:
Bjørn Mork
2021-06-24 23:04:08 +02:00
committed by Christian Lamparter
parent 6102f883ce
commit daefc646e6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/realtek/image/Makefile
View File

@@ -10,7 +10,7 @@ DEVICE_VARS += ZYXEL_VERS
define Build/zyxel-vers define Build/zyxel-vers
( echo VERS;\ ( echo VERS;\
for hw in $(1); do\ for hw in $(ZYXEL_VERS); do\
echo -n "V9.99($$hw.0) | ";\ echo -n "V9.99($$hw.0) | ";\
date -d @$(SOURCE_DATE_EPOCH) +%m/%d/%Y;\ date -d @$(SOURCE_DATE_EPOCH) +%m/%d/%Y;\
done ) >> $@ done ) >> $@
@@ -117,7 +117,7 @@ define Device/zyxel_gs1900
IMAGE_SIZE := 6976k IMAGE_SIZE := 6976k
DEVICE_VENDOR := ZyXEL DEVICE_VENDOR := ZyXEL
UIMAGE_MAGIC := 0x83800000 UIMAGE_MAGIC := 0x83800000
KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | zyxel-vers $$$$(ZYXEL_VERS) | \ KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | zyxel-vers | \
uImage gzip uImage gzip
endef endef