From: Scott Mercer Date: Mon, 21 Apr 2025 17:12:37 +0000 (-0400) Subject: qualcommax: ipq5018: gl-b3000: fix rootfs_size in bootscript X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18556%2Fhead;p=thirdparty%2Fopenwrt.git qualcommax: ipq5018: gl-b3000: fix rootfs_size in bootscript rootfs_size was being set after the bootscript was already copied to KDIR_TMP/ this was sneaky because it only affected the initial compile. All subsequent compiles the rootfs_size is correct before the copy is made and the bug goes un discovered. Hence the reason I missed it during testing. this patch fixes the issue and also refactors the make recipe to update rootfs_size after the copy is made, and updates the copy exclusively. Fixes: 3307fe8ee4cf ("qualcommax: ipq50xx: add support for GL.iNET GL-B3000") Signed-off-by: Scott Mercer Link: https://github.com/openwrt/openwrt/pull/18556 Signed-off-by: Robert Marko --- diff --git a/include/image-commands.mk b/include/image-commands.mk index d767ab356e7..ac3f305362b 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -511,15 +511,15 @@ define Build/gl-qsdk-factory $(CP) $(BOOT_SCRIPT) $(KDIR_TMP)/ $(shell mv $(GL_IMGK) $(GL_IMGK).tmp) + sed -i "s/rootfs_size/`wc -c $(GL_IMGK) | \ + cut -d " " -f 1 | xargs printf "0x%x"`/g" $(KDIR_TMP)/$(BOOT_SCRIPT); + $(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh \ $(GL_ITS) \ $(BOOT_SCRIPT) \ $(GL_UBI) \ $(GL_IMGK) - sed -i "s/rootfs_size/`wc -c $(GL_IMGK) | \ - cut -d " " -f 1 | xargs printf "0x%x"`/g" $(BOOT_SCRIPT); - PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f \ $(GL_ITS) \ $(GL_IMGK)