diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-25 00:12:18 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-25 00:12:18 +0100 |
| commit | 4e48fa808ec123962c0203282742f9ce641a40d3 (patch) | |
| tree | c964404c63110a8e89fb4d65e7c19c39d3df8e23 /script | |
| parent | b4fb2510085dc454ec39fcc55619bd38173776ce (diff) | |
lib.sh: simplify use of environment variables
don't have a separate variable for them.
just export them directly and use them directly.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/roms | 6 | ||||
| -rwxr-xr-x | script/trees | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/script/roms b/script/roms index 5a315202..d5eedd6a 100755 --- a/script/roms +++ b/script/roms @@ -59,7 +59,7 @@ main() [ -d "bin/$board" ] && targets="$targets, $x"; continue done - [ -n "$ser" ] && [ "$xbmk_release" = "y" ] && \ + [ -n "$ser" ] && [ "$XBMK_RELEASE" = "y" ] && \ mkrom_tarball "bin/serprog_$ser" && return 0 [ -z "$ser" ] && [ -z "$targets" ] && $err "No images were compiled" @@ -96,7 +96,7 @@ configure_target() x_ ./update trees -b coreboot $board [ -z "$tree" ] && $err "$board: tree not defined" - [ "$xbmk_release" = "y" ] && [ "$release" = "n" ] && return 1 + [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && return 1 [ "$board" = "$tree" ] && return 1 cbdir="src/coreboot/$tree" @@ -186,7 +186,7 @@ add_seabios_payload() cprom() { x_ mkdir -p "${1%/*}"; x_ cp "$tmprom" "$1" - [ "$xbmk_release" = "y" ] && mksha512sum "$1" "vendorhashes" && \ + [ "$XBMK_RELEASE" = "y" ] && mksha512sum "$1" "vendorhashes" && \ x_ ./vendor inject -r "$1" -b "$board" -n nuke; return 0 } diff --git a/script/trees b/script/trees index 2619892f..7f6f2f25 100755 --- a/script/trees +++ b/script/trees @@ -9,7 +9,7 @@ set -u -e . "include/lib.sh" . "include/git.sh" -cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$threads" +cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" eval `setvars "" xarch cdir config config_name xlang mode makeargs \ listfile project target target_dir targets tree _f target1 bootstrapargs \ autoconfargs cmakedir elfdir autogenargs xtree` @@ -185,7 +185,7 @@ check_coreboot_utils() utilmode="" [ -z "$mode" ] || utilmode="clean" - x_ make -C "$utilsrcdir" $utilmode -j$threads $cbmakeargs + x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ x_ mkdir -p "$utilelfdir" && \ x_ cp "$utilsrcdir/$util" "elf/$util/$1" @@ -240,7 +240,7 @@ run_make_command() printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \ && makeargs="$makeargs $cbmakeargs" - make -C "$cdir" $mode -j$threads $makeargs || $err "!mk $cdir $mode" + make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode" [ "$project" = "grub" ] && [ -z "$mode" ] && mkpayload_grub |