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 commit5c3679e39b
("at91: sama7: fix racy SD card image generation"). Fixes:5c3679e39b
("at91: sama7: fix racy SD card image generation") Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
parent
26595eac05
commit
3b669bc3f3
2 changed files with 2 additions and 2 deletions
|
@ -35,7 +35,7 @@ define Build/at91-sdcard
|
||||||
./gen_at91_sdcard_img.sh \
|
./gen_at91_sdcard_img.sh \
|
||||||
$@.img \
|
$@.img \
|
||||||
$@.boot \
|
$@.boot \
|
||||||
$(KDIR)/root.ext4 \
|
$(IMAGE_ROOTFS) \
|
||||||
$(AT91_SD_BOOT_PARTSIZE) \
|
$(AT91_SD_BOOT_PARTSIZE) \
|
||||||
$(CONFIG_TARGET_ROOTFS_PARTSIZE)
|
$(CONFIG_TARGET_ROOTFS_PARTSIZE)
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ define Build/at91-sdcard
|
||||||
./gen_at91_sdcard_img.sh \
|
./gen_at91_sdcard_img.sh \
|
||||||
$@.img \
|
$@.img \
|
||||||
$@.boot \
|
$@.boot \
|
||||||
$(KDIR)/root.ext4 \
|
$(IMAGE_ROOTFS) \
|
||||||
$(AT91_SD_BOOT_PARTSIZE) \
|
$(AT91_SD_BOOT_PARTSIZE) \
|
||||||
$(CONFIG_TARGET_ROOTFS_PARTSIZE)
|
$(CONFIG_TARGET_ROOTFS_PARTSIZE)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue