[openwrt/openwrt] ath79: fix rootfs padding for D-Link DAP-2xxx

LEDE Commits lede-commits at lists.infradead.org
Sat Jun 25 13:19:00 PDT 2022


chunkeey pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/b9d67e2608134e6d5c4f8c4d64be7271ccc8455c

commit b9d67e2608134e6d5c4f8c4d64be7271ccc8455c
Author: Sebastian Schaper <openwrt at sebastianschaper.net>
AuthorDate: Wed Jun 22 23:38:26 2022 +0200

    ath79: fix rootfs padding for D-Link DAP-2xxx
    
    It was observed that `rootfs_data` was sometimes not correctly erased
    after performing sysupgrade, resulting in previous settings to prevail.
    
    Add call to `wrgg-pad-rootfs` in sysupgrade image recipe to ensure any
    previous jffs2 will be wiped, consistent with DAP-2610 from the ipq40xx
    target, which introduced the double-flashing procedure for these devices.
    
    Signed-off-by: Sebastian Schaper <openwrt at sebastianschaper.net>
    (cherry picked from commit f770c33d7bb94b610d3a1c1fa84bc917678b65bc)
---
 target/linux/ath79/image/generic.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 5f8fc922da..c4b810cb59 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -862,7 +862,8 @@ define Device/dlink_dap-2xxx
   IMAGE/factory.img := append-kernel | pad-offset 6144k 160 | \
 	append-rootfs | wrgg-pad-rootfs | mkwrggimg | check-size
   IMAGE/sysupgrade.bin := append-kernel | mkwrggimg | \
-	pad-to $$$$(BLOCKSIZE) | append-rootfs | check-size | append-metadata
+	pad-to $$$$(BLOCKSIZE) | append-rootfs | wrgg-pad-rootfs | \
+	check-size | append-metadata
   KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma
   KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg
 endef




More information about the lede-commits mailing list