summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/get.sh31
-rw-r--r--include/inject.sh16
-rw-r--r--include/lib.sh16
-rw-r--r--include/release.sh6
-rw-r--r--include/rom.sh21
-rw-r--r--include/tree.sh37
-rw-r--r--include/vendor.sh74
-rwxr-xr-xmk5
8 files changed, 81 insertions, 125 deletions
diff --git a/include/get.sh b/include/get.sh
index ebaaaff1..4b31c7c9 100644
--- a/include/get.sh
+++ b/include/get.sh
@@ -10,9 +10,8 @@ tmpgitcache="$XBMK_CACHE/tmpgit"
fetch_targets()
{
- e "src/$project/$tree" d && return 0
- git_prep "$url" "$bkup_url" "$xbmkpwd/$configdir/$tree/patches" \
- "src/$project/$tree" with_submodules
+ [ -d "src/$project/$tree" ] || git_prep "$url" "$bkup_url" \
+ "$xbmkpwd/$configdir/$tree/patches" "src/$project/$tree" submod; :
}
fetch_project()
@@ -20,9 +19,7 @@ fetch_project()
eval "`setvars "" xtree`"
eval "`setcfg "config/git/$project/pkg.cfg"`"
- chkvars url bkup_url
-
- [ -n "$xtree" ] && x_ ./mk -f coreboot "$xtree"
+ chkvars url bkup_url && [ -n "$xtree" ] && x_ ./mk -f coreboot "$xtree"
[ -z "$depend" ] || for d in $depend ; do
x_ ./mk -f $d
done
@@ -46,7 +43,7 @@ git_prep()
_loc="$4" # $1 and $2 are gitrepo and gitrepo_backup
chkvars rev
- xbmkget git "$1" "$2" "$tmpgit" "$rev" "$_patchdir"
+ xbget git "$1" "$2" "$tmpgit" "$rev" "$_patchdir"
if singletree "$project" || [ $# -gt 4 ]; then
dx_ fetch_submodule "$mdir/module.list"
fi
@@ -71,19 +68,19 @@ fetch_submodule()
chkvars "sub${st}" "sub${st}_bkup" "subhash"
[ "$st" = "git" ] && x_ rm -Rf "$tmpgit/$1"
- eval xbmkget "$st" "\$sub$st" "\$sub${st}_bkup" "$tmpgit/$1" \
+ eval xbget "$st" "\$sub$st" "\$sub${st}_bkup" "$tmpgit/$1" \
"$subhash" "$mdir/${1##*/}/patches"
}
-xbmkget()
+xbget()
{
[ "$1" = "curl" ] || [ "$1" = "copy" ] || [ "$1" = "git" ] || \
- err "Bad dlop (arg 1): xbmkget $*"
+ err "Bad dlop (arg 1): xbget $*"
echk="f" && [ "$1" = "git" ] && echk="d"
for url in "$2" "$3"; do
- [ -n "$url" ] || err "empty URL given in: xbmkget $*"
+ [ -n "$url" ] || err "empty URL given in: xbget $*"
try_file "$url" "$@" || continue
eval "[ -$echk \"$4\" ] || continue"
return 0 # successful download/copy
@@ -109,8 +106,7 @@ try_file()
eval "[ -$echk \"$cached\" ] || return 1"
if [ "$2" = "git" ]; then
- [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || \
- err "Can't clone final repo in command: try_file $*"; :
+ [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || err; :
else
bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1
[ "$cached" != "$5" ] && x_ cp "$cached" "$5"
@@ -129,8 +125,7 @@ try_curl()
try_copy()
{
- [ -L "$2" ] && printf "symlink %s (trycp %s)\n" "$2" "$*" && return 1
- [ ! -f "$2" ] && printf "%s missing (trycp %s)\n" "$2" "$*" && return 1
+ e "$2" f missing && return 1; :
( x_ cp "$2" "$1" ) || return 1; :
}
@@ -152,10 +147,10 @@ try_git()
bad_checksum()
{
- [ ! -f "$2" ] && printf "'%s' missing, %s\n" "$2" "$1" 1>&2 && return 0
+ e "$2" f missing && return 0
csum="$(x_ sha512sum "$2" | awk '{print $1}')" || err "!sha512 '$2' $1"
- [ "$csum" != "$1" ] && printf "BAD SHA512, '%s'; need '%s', got %s\n" \
- "$2" "$1" "$csum" 1>&2 && x_ rm -f "$2" && return 0; return 1
+ [ "$csum" = "$1" ] && return 1; x_ rm -f "$2"
+ printf "BAD SHA512 %s, '%s'; need '%s'\n" "$csum" "$2" "$1" 1>&2
}
tmpclone()
diff --git a/include/inject.sh b/include/inject.sh
index d2808301..9354b439 100644
--- a/include/inject.sh
+++ b/include/inject.sh
@@ -6,7 +6,7 @@
cbcfgsdir="config/coreboot"
tmpromdel="$XBMK_CACHE/DO_NOT_FLASH"
nvm="util/nvmutil/nvm"
-ifdtool="elf/ifdtool/default/ifdtool"
+ifdtool="elf/coreboot/default/ifdtool"
cv="CONFIG_GBE_BIN_PATH"
[ -n "$cvxbmk" ] && cv="$cv $cvxbmk"
@@ -38,7 +38,7 @@ inject()
esac
[ "$new_mac" = "keep" ] && new_mac=""
- check_release
+ x_ e "$archive" f && check_release
check_target && patch_release
[ "$xchanged" = "y" ] && remktar
@@ -52,20 +52,14 @@ inject()
check_release()
{
[ -L "$archive" ] && err "'$archive' is a symlink"
- e "$archive" f missing && err "'$archive' missing"
archivename="`basename "$archive"`" || err "Can't get '$archive' name"
- [ -z "$archivename" ] && err "Can't determine archive name"
case "$archivename" in
- *_src.tar.xz)
- err "'$archive' is a src archive, silly!" ;;
- grub_*|seagrub_*|custom_*|seauboot_*|seabios_withgrub_*)
- err "'$archive' is a ROM image (it must be a tarball)" ;;
+ *_src.tar.xz) err "'$archive' is a src archive, silly!" ;;
*.tar.xz) _stripped_prefix="${archivename#*_}"
board="${_stripped_prefix%.tar.xz}" ;;
- *)
- err "'$archive': could not detect board type"
+ *) err "'$archive': could not detect board type" ;;
esac; :
}
@@ -77,7 +71,7 @@ check_target()
eval "`setcfg "$boarddir/target.cfg"`"
chkvars tree && x_ ./mk -d coreboot "$tree"
- ifdtool="elf/ifdtool/$tree/ifdtool"
+ ifdtool="elf/coreboot/$tree/ifdtool"
[ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform"; :
}
diff --git a/include/lib.sh b/include/lib.sh
index 7c4d71ea..b40772fa 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -4,8 +4,8 @@
# Copyright (c) 2020-2025 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2025 Alper Nebi Yasak <alpernebiyasak@gmail.com>
-cbfstool="elf/cbfstool/default/cbfstool"
-rmodtool="elf/cbfstool/default/rmodtool"
+cbfstool="elf/coreboot/default/cbfstool"
+rmodtool="elf/coreboot/default/rmodtool"
remkdir()
{
@@ -53,12 +53,10 @@ setvars()
fi
val="$1"
shift 1
- while true; do
- [ $# -lt 1 ] && break
- _setvars="$1=\"$val\"; $_setvars"
+ while [ $# -gt 0 ]; do
+ printf "%s=\"%s\"\n" "$1" "$val"
shift 1
done
- printf "%s\n" "${_setvars% }"
}
setcfg()
@@ -71,11 +69,9 @@ setcfg()
chkvars()
{
- while true; do
- [ $# -lt 1 ] && break
+ while [ $# -gt 0 ]; do
eval "[ -n \"\${$1+x}\" ] || err \"$1 unset\""
- eval "[ -n \"\$$1\" ] || err \"$1 unset\""
- shift 1
+ eval "[ -n \"\$$1\" ] || err \"$1 unset\"; shift 1; :"
done; :
}
diff --git a/include/release.sh b/include/release.sh
index 5b822c7b..c13be2c3 100644
--- a/include/release.sh
+++ b/include/release.sh
@@ -19,16 +19,14 @@ release()
done
reldest="$reldir/$version"
- [ -e "$reldest" ] && \
- err "already exists: \"$reldest\""
+ [ -e "$reldest" ] && err "already exists: \"$reldest\""
vdir="$XBMK_CACHE/relpwd/${xbtmp##*/}/$version"
rsrc="$vdir/${relname}_src"
remkdir "$vdir"
x_ git clone . "$rsrc"
- x_ cp ".version" "$rsrc/.version"
- x_ cp ".versiondate" "$rsrc/.versiondate"
+ update_xbmkver "$rsrc"
prep_release src
prep_release tarball
diff --git a/include/rom.sh b/include/rom.sh
index e8caf024..972f264e 100644
--- a/include/rom.sh
+++ b/include/rom.sh
@@ -48,30 +48,25 @@ 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"; :
}
check_coreboot_util()
{
- [ "$badhash" = "y" ] && x_ rm -f "elf/$1/$tree/$1"
- e "elf/$1/$tree/$1" f && return 0
+ [ "$badhash" = "y" ] && x_ rm -f "elf/coreboot/$tree/$1"
+ e "elf/coreboot/$tree/$1" f && return 0
- utilelfdir="elf/$1/$tree"
+ utilelfdir="elf/coreboot/$tree"
utilsrcdir="src/coreboot/$tree/util/$1"
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()
@@ -85,7 +80,7 @@ mkcorebootbin()
displaymode="${initmode##*_}"
[ "$displaymode" = "$initmode" ] && displaymode="" # "normal" config
initmode="${initmode%%_*}"
- cbfstool="elf/cbfstool/$tree/cbfstool"
+ cbfstool="elf/coreboot/$tree/cbfstool"
[ -z "$payload_uboot" ] || [ "$payload_uboot" = "amd64" ] || \
[ "$payload_uboot" = "i386" ] || [ "$payload_uboot" = "arm64" ] \
diff --git a/include/tree.sh b/include/tree.sh
index 11607eed..7bfddf67 100644
--- a/include/tree.sh
+++ b/include/tree.sh
@@ -45,8 +45,7 @@ trees()
[ -z "$_f" ] && err "missing flag ($flags)"
[ -z "$project" ] && fx_ "x_ ./mk $_f" x_ ls -1 config/git && return 1
- [ -f "config/git/$project/pkg.cfg" ] || \
- err "config/git/$project/pkg.cfg missing"
+ e "config/git/$project/pkg.cfg" f missing && err "$project: no pkg.cfg"
for d in "elf" "config/data" "config" "src"; do
eval "${d#*/}dir=\"$d/$project\""
@@ -75,9 +74,7 @@ build_project()
[ ! -f "$listfile" ] || $dry elfcheck || return 0
[ "$mode" = "distclean" ] && mode="clean"
- run_make_command || return 0
-
- [ -n "$mode" ] || $dry copy_elf; :
+ run_make_command && [ -z "$mode" ] && $dry copy_elf; :
}
build_targets()
@@ -89,13 +86,9 @@ build_targets()
unset CROSS_COMPILE
export PATH="$xbmkpath"
[ "$x" = "list" ] && x_ ls -1 "config/$project" && \
- listfile="" && break
-
- target="$x"
+ listfile="" && break; target="$x"
printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target"
- x_ handle_defconfig
-
- [ -n "$mode" ] || x_ $postmake
+ x_ handle_defconfig && [ -z "$mode" ] && x_ $postmake; :
done; :
}
@@ -120,8 +113,7 @@ handle_defconfig()
[ "$_f" = "-d" ] || defconfig="$y"
[ -n "$mode" ] || check_defconfig || continue
- handle_makefile
- [ -n "$mode" ] || $dry copy_elf
+ handle_makefile && [ -z "$mode" ] && $dry copy_elf; :
done; :
}
@@ -130,8 +122,7 @@ configure_project()
eval "`setvars "" cleanargs build_depend autoconfargs xtree postmake \
makeargs btype mkhelper bootstrapargs premake release xlang xarch \
badhash`"
- _tcfg="$1/target.cfg"
- [ -f "$_tcfg" ] || btype="auto"
+ _tcfg="$1/target.cfg" && [ ! -f "$_tcfg" ] && btype="auto"
e "$datadir/mkhelper.cfg" f && eval "`setcfg "$datadir/mkhelper.cfg"`"
while e "$_tcfg" f || [ "$cmd" != "build_project" ]; do
@@ -144,8 +135,7 @@ configure_project()
[ "$do_make" != "n" ] && break
[ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] \
- && break
- _tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg"
+ && break; _tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg"
done
[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && return 1
[ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1
@@ -187,8 +177,7 @@ check_project_hashes()
[ "$pjhash" != "$old_pjhash" ] && badhash="y"
[ -f "$XBMK_CACHE/hash/$project$tree" ] || badhash="y"
- printf "%s\n" "$pjhash" > "$XBMK_CACHE/hash/$project$tree" || \
- err "!mk $XBMK_CACHE/hash/$project$tree"
+ printf "%s\n" "$pjhash" > "$XBMK_CACHE/hash/$project$tree" || err
[ "$badhash" != "y" ] || x_ rm -Rf "src/$project/$tree" \
"elf/$project/$tree" "elf/$project/$target"; :
@@ -295,15 +284,17 @@ run_make_command()
{
[ -n "$mode" ] || x_ $premake
- $dry check_cmake "$srcdir" && [ -z "$mode" ] && \
- $dry check_autoconf "$srcdir"
+ $dry check_cmake "$srcdir"
+ [ -n "$mode" ] || ( $dry check_autoconf "$srcdir" ) || err
$dry check_makefile "$srcdir" || return 1
$dry x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
[ -n "$mode" ] || x_ $mkhelper
+ check_makefile "$srcdir" || return 0
[ "$mode" != "clean" ] || \
- $dry make -C "$srcdir" $cleanargs distclean || :; :
+ $dry make -C "$srcdir" $cleanargs distclean || \
+ $dry x_ make -C "$srcdir" $cleanargs clean; :
}
check_cmake()
@@ -315,12 +306,10 @@ check_cmake()
check_autoconf()
{
- (
x_ cd "$1"
[ -f "bootstrap" ] && x_ ./bootstrap $bootstrapargs
[ -f "autogen.sh" ] && x_ ./autogen.sh $autogenargs
[ -f "configure" ] && x_ ./configure $autoconfargs; :
- ) || err "can't bootstrap project: $1"; :
}
check_makefile()
diff --git a/include/vendor.sh b/include/vendor.sh
index 6702f5fd..f7dce827 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -21,17 +21,15 @@ appdir="$vendir/app"
vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
# lbmk-specific extension to the "cv" variable (not suitable for cbmk)
-cvchk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
+cvchk="CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_MRC_FILE CONFIG_ME_BIN_PATH \
CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE CONFIG_FSP_M_FILE \
CONFIG_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2"
# lbmk-specific extensions to the "cv" variable (not suitable for cbmk)
-cvxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE \
- CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET \
+cvxbmk="CONFIG_FSP_FULL_FD CONFIG_IFD_BIN_PATH CONFIG_FSP_M_CBFS \
+ CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET CONFIG_FSP_USE_REPO \
CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 CONFIG_FSP_S_CBFS \
- CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH \
- CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS \
- CONFIG_FSP_USE_REPO CONFIG_FSP_FULL_FD"
+ CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH"
# lbmk-specific extensions; mostly used for downloading vendor files
eval "`setvars "" has_hashes EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
@@ -53,35 +51,28 @@ download()
getfiles()
{
- [ -z "$CONFIG_HAVE_ME_BIN" ] || fetch intel_me "$DL_url" \
- "$DL_url_bkup" "$DL_hash" "$CONFIG_ME_BIN_PATH" "curl" \
- "$ME_bin_hash"
- [ -z "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" ] || fetch sch5545ec \
- "$SCH5545EC_DL_url" "$SCH5545EC_DL_url_bkup" "$SCH5545EC_DL_hash" \
- "$CONFIG_SMSC_SCH5545_EC_FW_FILE" "curl" "$SCH5545EC_bin_hash"
- [ -z "$CONFIG_KBC1126_FW1" ] || fetch kbc1126ec "$EC_url" \
- "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW1" "curl" \
- "$EC_FW1_hash"
- [ -z "$CONFIG_KBC1126_FW2" ] || fetch kbc1126ec "$EC_url" \
- "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW2" "curl" \
- "$EC_FW2_hash"
- [ -z "$CONFIG_VGA_BIOS_FILE" ] || fetch e6400vga "$E6400_VGA_DL_url" \
- "$E6400_VGA_DL_url_bkup" "$E6400_VGA_DL_hash" \
- "$CONFIG_VGA_BIOS_FILE" "curl" "$E6400_VGA_bin_hash"
- [ -z "$CONFIG_HAVE_MRC" ] || fetch "mrc" "$MRC_url" "$MRC_url_bkup" \
- "$MRC_hash" "$CONFIG_MRC_FILE" "curl" "$MRC_bin_hash"
- [ -z "$CONFIG_REFCODE_BLOB_FILE" ] || fetch "refcode" "$MRC_url" \
- "$MRC_url_bkup" "$MRC_hash" "$CONFIG_REFCODE_BLOB_FILE" "curl" \
- "$REF_bin_hash"
- [ -z "$CONFIG_LENOVO_TBFW_BIN" ] || fetch "tbfw" "$TBFW_url" \
- "$TBFW_url_bkup" "$TBFW_hash" "$CONFIG_LENOVO_TBFW_BIN" "curl" \
- "$TBFW_bin_hash"
- [ -z "$CONFIG_FSP_M_FILE" ] || fetch "fsp" "$CONFIG_FSP_FD_PATH" \
- "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" "$CONFIG_FSP_M_FILE" "copy" \
- "$FSPM_bin_hash"
- [ -z "$CONFIG_FSP_S_FILE" ] || fetch "fsp" "$CONFIG_FSP_FD_PATH" \
- "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" "$CONFIG_FSP_S_FILE" "copy" \
- "$FSPS_bin_hash"; :
+ fetch intel_me "$DL_url" "$DL_url_bkup" "$DL_hash" \
+ "$CONFIG_ME_BIN_PATH" curl "$ME_bin_hash"
+ fetch sch5545ec "$SCH5545EC_DL_url" "$SCH5545EC_DL_url_bkup" \
+ "$SCH5545EC_DL_hash" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" curl \
+ "$SCH5545EC_bin_hash"
+ fetch kbc1126ec "$EC_url" "$EC_url_bkup" "$EC_hash" \
+ "$CONFIG_KBC1126_FW1" curl "$EC_FW1_hash"
+ fetch kbc1126ec "$EC_url" "$EC_url_bkup" "$EC_hash" \
+ "$CONFIG_KBC1126_FW2" curl "$EC_FW2_hash"
+ fetch e6400vga "$E6400_VGA_DL_url" "$E6400_VGA_DL_url_bkup" \
+ "$E6400_VGA_DL_hash" "$CONFIG_VGA_BIOS_FILE" curl \
+ "$E6400_VGA_bin_hash"
+ fetch mrc "$MRC_url" "$MRC_url_bkup" "$MRC_hash" "$CONFIG_MRC_FILE" \
+ curl "$MRC_bin_hash"
+ fetch refcode "$MRC_url" "$MRC_url_bkup" "$MRC_hash" \
+ "$CONFIG_REFCODE_BLOB_FILE" curl "$REF_bin_hash"
+ fetch tbfw "$TBFW_url" "$TBFW_url_bkup" "$TBFW_hash" \
+ "$CONFIG_LENOVO_TBFW_BIN" curl "$TBFW_bin_hash"
+ fetch fsp "$CONFIG_FSP_FD_PATH" "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" \
+ "$CONFIG_FSP_M_FILE" copy "$FSPM_bin_hash"
+ fetch fsp "$CONFIG_FSP_FD_PATH" "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" \
+ "$CONFIG_FSP_S_FILE" copy "$FSPS_bin_hash"; :
}
fetch()
@@ -90,7 +81,7 @@ fetch()
dl="$2"
dl_bkup="$3"
dlsum="$4"
- _dest="${5##*../}"
+ _dest="${5##*../}" && [ -z "$_dest" ] && return 0
_pre_dest="$XBMK_CACHE/tmpdl/check" || err "!fetch, mktemp, $*"
dlop="$6"
binsum="$7"
@@ -111,12 +102,11 @@ fetch()
done; :
# download the file (from the internet) to extract from
- xbmkget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum"
+ xbget "$dlop" "$dl" "$dl_bkup" "$_dl" "$dlsum"
x_ rm -Rf "${_dl}_extracted"
# skip extraction if a cached extracted file exists
- ( xbmkget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) \
- || :
+ ( xbget copy "$_dl_bin" "$_dl_bin" "$_dest" "$binsum" 2>/dev/null ) || :
[ -f "$_dest" ] && return 0
x_ mkdir -p "${_dest%/*}"
@@ -275,14 +265,14 @@ bootstrap()
cbdir="src/coreboot/$tree"
mecleaner="$xbmkpwd/$cbdir/util/me_cleaner/me_cleaner.py"
kbc1126_ec_dump="$xbmkpwd/$cbdir/util/kbc1126/kbc1126_ec_dump"
- cbfstool="elf/cbfstool/$tree/cbfstool"
- rmodtool="elf/cbfstool/$tree/rmodtool"
+ cbfstool="elf/coreboot/$tree/cbfstool"
+ rmodtool="elf/coreboot/$tree/rmodtool"
x_ ./mk -f coreboot "${cbdir##*/}"
fx_ "x_ ./mk -b" printf "uefitool\nbiosutilities\nbios_extract\n"
[ -d "${kbc1126_ec_dump%/*}" ] && x_ make -C "$cbdir/util/kbc1126"
[ -n "$MRC_refcode_cbtree" ] && \
- cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" && \
+ cbfstoolref="elf/coreboot/$MRC_refcode_cbtree/cbfstool" && \
x_ ./mk -d coreboot "$MRC_refcode_cbtree"; :
}
diff --git a/mk b/mk
index f358bc3a..8da15f5b 100755
--- a/mk
+++ b/mk
@@ -26,14 +26,13 @@ main()
case "$cmd" in
version) printf "%s\nWebsite: %s\n" "$relname" "$projectsite" ;;
release|download|inject) $cmd "$@" ;;
- -*) return 0 ;;
+ -*) return 1 ;;
*) err "bad command" ;;
esac
set -u -e # some commands disable them. turn them on!
- return 1
}
-main "$@" || exit 0
+main "$@" && exit 0
. "include/tree.sh"
generated by cgit v1.2.1 (git 2.18.0) at 2025-05-28 17:30:11 +0000