diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-27 21:49:01 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-27 21:49:01 +0100 |
| commit | 62d5fea0d254ef1bc66fc4b3871668e6090fc85a (patch) | |
| tree | 48862ac15517504b1837026e38b0aae47d1088bf /include/rom.sh | |
| parent | f66265eb6cce45bdf75604894e8bcb4052c3c99d (diff) | |
| parent | 00d99adb5c1e0343bf889a260ea57b1292a3bc9c (diff) | |
Merge branch 'master' into 25.06_branch25.06_branch
Diffstat (limited to 'include/rom.sh')
| -rw-r--r-- | include/rom.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/rom.sh b/include/rom.sh index c1b78c75..972f264e 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -48,8 +48,7 @@ corebootpremake() [ -n "$mode" ] || [ ! -f "$srcdir/.config" ] || $dry printf \ "CONFIG_CCACHE=y\n" >> "$srcdir/.config" || err "$srcdir: !cook"; : fx_ check_coreboot_util printf "cbfstool\nifdtool\n" - printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \ - err "!mk $srcdir .coreboot-version" + printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || err [ -z "$mode" ] && [ "$target" != "$tree" ] && \ x_ ./mk download "$target"; : } @@ -65,13 +64,9 @@ check_coreboot_util() utilmode="" && [ -n "$mode" ] && utilmode="clean" x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $makeargs [ -n "$mode" ] && x_ rm -Rf "$utilelfdir" && return 0 - [ -z "$mode" ] || return 0 - [ -f "$utilelfdir/$1" ] && return 0 - - x_ mkdir -p "$utilelfdir" - x_ cp "$utilsrcdir/$1" "$utilelfdir" - [ "$1" = "cbfstool" ] || return 0 - x_ cp "$utilsrcdir/rmodtool" "$utilelfdir" + [ ! -f "$utilelfdir/$1" ] && x_ mkdir -p "$utilelfdir" && \ + x_ cp "$utilsrcdir/$1" "$utilelfdir" && [ "$1" = "cbfstool" ] && \ + x_ cp "$utilsrcdir/rmodtool" "$utilelfdir"; : } mkcorebootbin() |