From 4f562fd273e9039d5f8d6f00ade829d47fe809f8 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 20 Sep 2026 22:35:20 +0100 Subject: mk: skip *coreboot* same target/tree builds this implements the previous reverted fix, but only for coreboot. it's done tree-wide, but individual projects must handle it in their mkhelpers, via if_not_skip_build if_not_skip_build *does* universally control whether make is executed, but not make-clean. now we can do: ./mk -b coreboot default this will effectively do the same thing as -d, because no config is available there. otherwise, we try to do -b with a config, where none exists. if noconfig is set, then we ignore this, because no config will ever be used. when noconfig isn't set, it is assumed that we must always have a config for building. Signed-off-by: Leah Rowe --- include/fw/rom.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/fw/rom.sh b/include/fw/rom.sh index dc7ccd6f..cfd332a0 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -102,7 +102,7 @@ coreboot_pad_one_byte() [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \ return 0 - pad_one_byte "$srcdir/build/coreboot.rom" + $if_not_skip_build pad_one_byte "$srcdir/build/coreboot.rom" } mkcorebootbin() @@ -112,10 +112,10 @@ mkcorebootbin() for y in "$defscan"/*; do buildcfg="$y" - mkcorebootbin_real + $if_not_skip_build mkcorebootbin_real done - mkcoreboottar + $if_not_skip_build mkcoreboottar } mkcorebootbin_real() @@ -142,8 +142,8 @@ mkcorebootbin_real() elfrom="${elfrom}_$displaymode" elfrom="$elfrom/coreboot.rom" - x_ cp "$elfrom" "$tmprom" - unpad_one_byte "$tmprom" + $if_not_skip_build x_ cp "$elfrom" "$tmprom" + $if_not_skip_build unpad_one_byte "$tmprom" [ -n "$payload_uboot" ] && [ "$payload_uboot" != "amd64" ] && \ [ "$payload_uboot" != "i386" ] && [ "$payload_uboot" != "arm64" ] \ @@ -178,21 +178,21 @@ mkcorebootbin_real() payload_grubsea="n" [ -f "$cbfscfg" ] && \ - dx_ add_cbfs_option "$cbfscfg" + $if_not_skip_build dx_ add_cbfs_option "$cbfscfg" if grep "CONFIG_PAYLOAD_NONE=y" "$buildcfg"; then if [ "$payload_seabios" = "y" ]; then pname="seabios" - add_seabios + $if_not_skip_build add_seabios fi if [ "$payload_uboot" = "arm64" ]; then pname="uboot" - add_uboot "" fallback/payload default \ - "$target" u-boot.elf + $if_not_skip_build add_uboot "" fallback/payload \ + default "$target" u-boot.elf fi else pname="custom" - cprom + $if_not_skip_build cprom fi; : } -- cgit v1.2.1