Skip to content

Commit c64370c

Browse files
authored
Merge pull request #843 from Dstack-TEE/codex/fix-os-multiflavor-failure
fix(os): fail multi-flavor builds on first error
2 parents 9cbd3d9 + d89918f commit c64370c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

os/yocto/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ all: dist
2020
-include $(wildcard mk.d/*.mk)
2121

2222
dist: images
23-
$(foreach flavor,$(FLAVORS),./mkimage.sh --dist-name $(call flavor_to_dist,$(flavor)) --flavor $(flavor);)
23+
set -e; $(foreach flavor,$(FLAVORS),./mkimage.sh --dist-name $(call flavor_to_dist,$(flavor)) --flavor $(flavor);)
2424

2525
# Build common artifacts (shared across all flavors)
2626
# dstack-guest is built here first to warm sstate/downloads and avoid concurrent
@@ -30,17 +30,17 @@ images-common:
3030

3131
# Build flavor-specific artifacts using multiconfig (serial to avoid deadlock warnings)
3232
images-flavors:
33-
$(foreach flavor,$(FLAVORS),bitbake mc:$(flavor):dstack-rootfs mc:$(flavor):dstack-uki;)
33+
set -e; $(foreach flavor,$(FLAVORS),bitbake mc:$(flavor):dstack-rootfs mc:$(flavor):dstack-uki;)
3434

3535
images: images-common images-flavors
3636

3737
clean:
3838
bitbake -c cleansstate virtual/kernel dstack-initramfs dstack-ovmf
39-
$(foreach flavor,$(FLAVORS),bitbake -c cleansstate mc:$(flavor):dstack-rootfs mc:$(flavor):dstack-uki;)
39+
set -e; $(foreach flavor,$(FLAVORS),bitbake -c cleansstate mc:$(flavor):dstack-rootfs mc:$(flavor):dstack-uki;)
4040

4141
clean-dstack:
4242
bitbake -c cleansstate dstack-guest
43-
$(foreach flavor,$(FLAVORS),bitbake -c cleansstate mc:$(flavor):dstack-rootfs;)
43+
set -e; $(foreach flavor,$(FLAVORS),bitbake -c cleansstate mc:$(flavor):dstack-rootfs;)
4444

4545
clean-initrd:
4646
bitbake -c cleansstate dstack-initramfs

0 commit comments

Comments
 (0)