[openwrt/openwrt] at91: sam9x,sama5: fix racy SD card image generation

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/7370479224dde700537a73a81706bde6db820d8a

commit 7370479224dde700537a73a81706bde6db820d8a
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Tue Jan 3 12:44:51 2023 +0100

    at91: sam9x,sama5: fix racy SD card image generation
    
    We've few low spec (make -j3) build workers attached to the 22.03
    buildbot instance which from time to time exhibit following build
    failure during image generation (shortened for brewity):
    
     + dd bs=512 if=root.ext4 of=openwrt-22.03...sdcard.img.gz.img
     dd: failed to open 'root.ext4': No such file or directory
    
    Thats happening likely due to the fact, that on buildbots we've
    `TARGET_PER_DEVICE_ROOTFS=y` which produces differently named filesystem
    image in the SD card image target dependency chain:
    
     make_ext4fs -L rootfs ... root.ext4+pkg=68b329da
    
    and that hardcoded `root.ext4` image filename becomes available from
    other Make targets in the later stages. So lets fix this issue by using
    IMAGE_ROOTFS Make variable which should contain proper path to the root
    filesystem image.
    
    Fixing remaining subtargets ommited in commit 5c3679e39b61 ("at91:
    sama7: fix racy SD card image generation").
    
    Fixes: 5c3679e39b61 ("at91: sama7: fix racy SD card image generation")
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    (cherry picked from commit 3b669bc3f32f7594f38187a284a65ca2c35a0121)
---
 target/linux/at91/image/sam9x.mk | 2 +-
 target/linux/at91/image/sama5.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk
index b6c5e33ac4..3f57f4c8c8 100644
--- a/target/linux/at91/image/sam9x.mk
+++ b/target/linux/at91/image/sam9x.mk
@@ -35,7 +35,7 @@ define Build/at91-sdcard
   ./gen_at91_sdcard_img.sh \
 	$@.img \
 	$@.boot \
-	$(KDIR)/root.ext4 \
+	$(IMAGE_ROOTFS) \
 	$(AT91_SD_BOOT_PARTSIZE) \
 	$(CONFIG_TARGET_ROOTFS_PARTSIZE)
 
diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk
index 39db3e1cd0..7f4dd3316a 100644
--- a/target/linux/at91/image/sama5.mk
+++ b/target/linux/at91/image/sama5.mk
@@ -39,7 +39,7 @@ define Build/at91-sdcard
   ./gen_at91_sdcard_img.sh \
 	$@.img \
 	$@.boot \
-	$(KDIR)/root.ext4 \
+	$(IMAGE_ROOTFS) \
 	$(AT91_SD_BOOT_PARTSIZE) \
 	$(CONFIG_TARGET_ROOTFS_PARTSIZE)