[openwrt/openwrt] realtek: build sane factory images for DGS-1210 models

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 9 01:05:55 PDT 2022


svanheule pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/945b13e369ad262ad6d7086e34e048ff6f797bfc

commit 945b13e369ad262ad6d7086e34e048ff6f797bfc
Author: Markus Stockhausen <markus.stockhausen at gmx.de>
AuthorDate: Wed Jul 6 13:43:23 2022 +0200

    realtek: build sane factory images for DGS-1210 models
    
    During upload of firmware images the WebUI and CLI patch process
    extracts a version information from the uploaded file and stores it
    onto the jffs2 partition. To be precise it is written into the
    flash.txt or flash2.txt files depending on the selected target image.
    This data is not used anywhere else. The current OpenWrt factory
    image misses this label. Therefore version information shows only
    garbage. Fix this.
    
    Before:
    DGS-1210-20> show firmware information
    IMAGE ONE:
    Version      : xfo/QE~WQD"A\Scxq...
    Size         : 5505185 Bytes
    
    After:
    DGS-1210-20> show firmware information
    IMAGE ONE:
    Version      : OpenWrt
    Size         : 5505200 Bytes
    
    Tested-by: Luiz Angelo Daros de Luca <luizluca at gmail.com>
    Signed-off-by: Markus Stockhausen <markus.stockhausen at gmx.de>
    (cherry picked from commit fae3ac3560459320a88be86b31c572c4bca42645)
---
 target/linux/realtek/image/Makefile   | 5 +++++
 target/linux/realtek/image/rtl838x.mk | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/target/linux/realtek/image/Makefile b/target/linux/realtek/image/Makefile
index 3a1ba2f60e..cf779002e8 100644
--- a/target/linux/realtek/image/Makefile
+++ b/target/linux/realtek/image/Makefile
@@ -21,6 +21,11 @@ define Build/dlink-cameo
 	$(SCRIPT_DIR)/cameo-tag.py $@ $(DLINK_KERNEL_PART_SIZE)
 endef
 
+define Build/dlink-version
+	echo -n "OpenWrt" >> $@
+	dd if=/dev/zero bs=25 count=1 >> $@
+endef
+
 define Build/dlink-headers
         dd if=$@ bs=$(DLINK_KERNEL_PART_SIZE) count=1 of=$@.kernel_part; \
         dd if=$@ bs=$(DLINK_KERNEL_PART_SIZE) skip=1 of=$@.rootfs_part; \
diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk
index d72dc2191b..b0f307296d 100644
--- a/target/linux/realtek/image/rtl838x.mk
+++ b/target/linux/realtek/image/rtl838x.mk
@@ -23,7 +23,8 @@ define Device/d-link_dgs-1210
   CAMEO_BOARD_VERSION := 32
   IMAGES += factory_image1.bin
   IMAGE/factory_image1.bin := append-kernel | pad-to 64k | \
-	append-rootfs | pad-rootfs | pad-to 16 | check-size | dlink-headers
+	append-rootfs | pad-rootfs | pad-to 16 | check-size | \
+	dlink-version | dlink-headers
 endef
 
 define Device/d-link_dgs-1210-10p




More information about the lede-commits mailing list