[OpenWrt-Devel] [PATCH RFC 2/2] amp821xx: use newly added pad-squashfs for Meraki MR24

[Russell Senior]

Using pad-squashfs ensures that the root.squashfs is assigned sufficient
LEBs on UBI such that all reads of the rootfs succeed, in order to avoid
read failures and kernel panics.

This fixes one such kernel panic observed on Meraki MR24 where an
inopportune-sized unpadded root.squashfs occurred.

Note: ext4-sysupgrade firmware binaries will build with this patch, but
they are as nonsensical as before the patch. Finding a way to disable
ext4 builds for Meraki MR24 is left as a TODO.

Signed-off-by: Russell Senior <russell at personaltelco.net>
---
 target/linux/apm821xx/image/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index acfd478755..53192bb448 100644
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -133,7 +133,8 @@ define Device/meraki_mr24
   IMAGE_SIZE := 8191k
   KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND
   KERNEL_INITRAMFS := kernel-bin | lzma | dtb | MuImage-initramfs lzma
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin/squashfs := pad-squashfs | sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin/ext4 := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5
   SUPPORTED_DEVICES += mr24
 endef
-- 
2.23.0


-- 
Russell Senior, President
russell at personaltelco.net

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel