[openwrt/openwrt] rockchip: fix broken squashfs sysupgrade

LEDE Commits lede-commits at lists.infradead.org
Fri Sep 24 03:29:06 PDT 2021


blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b56f7407d999d29c200c8c5880655926ef9874b7

commit b56f7407d999d29c200c8c5880655926ef9874b7
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Thu Sep 23 21:01:37 2021 +0200

    rockchip: fix broken squashfs sysupgrade
    
    The rockchip platform supports squashfs SD card images. However, the
    resulting image is not padded to completely fill the rootfs partition.
    
    Because of that, the f2fs overlay might not be erased, resulting in
    uci-defaults not bing executed or the configuration not being erased,
    even though drop config was selected.
    
    Modify the image generation process so the image is padded to cover the
    entire root filesystem partition.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 target/linux/rockchip/image/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile
index f5fdff637f..e4db1e5d58 100644
--- a/target/linux/rockchip/image/Makefile
+++ b/target/linux/rockchip/image/Makefile
@@ -34,7 +34,7 @@ define Build/pine64-img
 	# http://opensource.rock-chips.com/wiki_Boot_option#Boot_flow
 	#
 	# U-Boot SPL expects the U-Boot ITB to be located at sector 0x4000 (8 MiB) on the MMC storage
-	$(SCRIPT_DIR)/gen_image_generic.sh \
+	PADDING=1 $(SCRIPT_DIR)/gen_image_generic.sh \
 		$@ \
 		$(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \
 		$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \



More information about the lede-commits mailing list