Przeglądaj źródła

mediatek: filogic: fix EAX17 rootfs hash in FIT node for per-device rootfs builds

When CONFIG_TARGET_PER_DEVICE_ROOTFS is enabled (as in buildbot builds),
the final per-device rootfs is assembled at root.squashfs+pkg=<hash> rather
than root.squashfs. The gen_netgear_rootfs_node.sh script was always hashing
root.squashfs (the base rootfs without device-specific packages), causing the
size and hash in the FIT node to not match the actual rootfs written to the
UBI volume, resulting in boot failure on buildbot-produced images.

Fix by using the per-device rootfs path when TARGET_PER_DEVICE_ROOTFS is set,
consistent with how include/image.mk handles the same distinction elsewhere.

Fixes: 46ab9f3f1c ("filogic: add support for Netgear EAX17")
Signed-off-by: Jascha Sundaresan <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/22839
Signed-off-by: Christian Marangi <[email protected]>
Jascha Sundaresan 3 dni temu
rodzic
commit
bc0a2c933e
1 zmienionych plików z 1 dodań i 1 usunięć
  1. 1 1
      target/linux/mediatek/image/filogic.mk

+ 1 - 1
target/linux/mediatek/image/filogic.mk

@@ -10,7 +10,7 @@ endef
 
 define Build/fit-with-netgear-top-level-rootfs-node
 	$(call Build/fit-its,$(1))
-	$(TOPDIR)/scripts/gen_netgear_rootfs_node.sh $(KERNEL_BUILD_DIR)/root.squashfs > [email protected]
+	$(TOPDIR)/scripts/gen_netgear_rootfs_node.sh $(KERNEL_BUILD_DIR)/root.squashfs$(if $(TARGET_PER_DEVICE_ROOTFS),+pkg=$(ROOTFS_ID/$(DEVICE_NAME))) > [email protected]
 	awk '/configurations/ { system("cat [email protected]") } 1' [email protected] > [email protected]
 	@mv -f [email protected] [email protected]
 	@rm -f [email protected]