coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 05:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "xbmk: don't use backticks for command substitution"

Browse Source 
This reverts commit 4999a49de3.
This commit is contained in:
Leah Rowe
2025-09-18 23:35:12 +01:00
parent 14bcb3a6fa
commit c11c5a7a14
10 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/data/coreboot/mkhelper.cfg
+2 -2
View File
@@ -8,8 +8,8 @@ seavgabiosrom="elf/seabios/default/default/libgfxinit/vgabios.bin"
pv="payload_seabios payload_memtest payload_grub payload_grubsea" pv="payload_seabios payload_memtest payload_grub payload_grubsea"
v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname" v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname"
v="$v displaymode tmprom newrom payload_uboot" v="$v displaymode tmprom newrom payload_uboot"
eval "$(setvars "n" $pv)" eval `setvars "n" $pv`
eval "$(setvars "" $v)" eval `setvars "" $v`
premake="corebootpremake" premake="corebootpremake"
mkhelper="coreboot_pad_one_byte" mkhelper="coreboot_pad_one_byte"
include/get.sh
+7 -7
View File
@@ -2,8 +2,8 @@
# Copyright (c) 2020-2021,2023-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2020-2021,2023-2025 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
eval "$(setvars "" loc url bkup_url subcurl subhash subgit subgit_bkup \ eval "`setvars "" loc url bkup_url subcurl subhash subgit subgit_bkup \
depend subcurl_bkup)" depend subcurl_bkup`"
tmpgit="$xbtmp/gitclone" tmpgit="$xbtmp/gitclone"
tmpgitcache="$xbtmp/tmpgit" tmpgitcache="$xbtmp/tmpgit"
@@ -16,8 +16,8 @@ fetch_targets()
fetch_project() fetch_project()
{ {
eval "$(setvars "" xtree)" eval "`setvars "" xtree`"
eval "$(setcfg "config/git/$project/pkg.cfg")" 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 [ -z "$depend" ] || for d in $depend ; do
@@ -55,8 +55,8 @@ git_prep()
fetch_submodule() fetch_submodule()
{ {
mcfgdir="$mdir/${1##*/}"; eval \ mcfgdir="$mdir/${1##*/}"; eval \
"$(setvars "" subhash subgit subgit_bkup subcurl subcurl_bkup st)" "`setvars "" subhash subgit subgit_bkup subcurl subcurl_bkup st`"
eval "$(setcfg "$mcfgdir/module.cfg" 0)" eval "`setcfg "$mcfgdir/module.cfg" 0`"
for xt in git curl; do for xt in git curl; do
_seval="if [ -n \"\$sub$xt\" ] || [ -n \"\$sub${xt}_bkup\" ]" _seval="if [ -n \"\$sub$xt\" ] || [ -n \"\$sub${xt}_bkup\" ]"
@@ -134,7 +134,7 @@ try_copy()
try_git() try_git()
{ {
gitdest="$(findpath "$1" || err "Can't get findpath for '$1'")" || \ gitdest="`findpath "$1" || err "Can't get findpath for '$1'"`" || \
err "failed findpath for '$1'" try_get "$@" err "failed findpath for '$1'" try_get "$@"
x_ rm -Rf "$tmpgitcache" x_ rm -Rf "$tmpgitcache"
include/init.sh
+12 -12
View File
@@ -13,13 +13,13 @@ projectsite="https://libreboot.org/"
[ -z "${PATH+x}" ] && \ [ -z "${PATH+x}" ] && \
export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
eval "$(setvars "" _nogit board reinstall versiondate aur_notice configdir \ eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbmklock \ datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbmklock \
cvxbmk cvchk xbmkpath is_child basetmp)" cvxbmk cvchk xbmkpath is_child basetmp`"
xbmk_init() xbmk_init()
{ {
xbmkpwd="$(pwd || err "Cannot generate PWD")" || err "!" xbmk_init "$@" xbmkpwd="`pwd || err "Cannot generate PWD"`" || err "!" xbmk_init "$@"
xbmklock="$xbmkpwd/lock" xbmklock="$xbmkpwd/lock"
basetmp="$xbmkpwd/xbmkwd" basetmp="$xbmkpwd/xbmkwd"
@@ -42,7 +42,7 @@ xbmkpkg()
xchk xbmkpkg "$@" xchk xbmkpkg "$@"
[ $# -gt 2 ] && reinstall="$3" [ $# -gt 2 ] && reinstall="$3"
eval "$(setcfg "config/dependencies/$2")" eval "`setcfg "config/dependencies/$2"`"
chkvars pkg_add pkglist chkvars pkg_add pkglist
x_ $pkg_add $pkglist x_ $pkg_add $pkglist
@@ -98,12 +98,12 @@ xbmk_set_env()
xbmk_child_set_tmp() xbmk_child_set_tmp()
{ {
eval "$(setvars "" xbtmp badtmp xbtmpchk xbtmpname)" eval `setvars "" xbtmp badtmp xbtmpchk xbtmpname`
[ -z "${TMPDIR+x}" ] && export TMPDIR="$basetmp" [ -z "${TMPDIR+x}" ] && export TMPDIR="$basetmp"
# extremely pedantic safety checks on TMPDIR # extremely pedantic safety checks on TMPDIR
xbtmpchk="$(findpath "$TMPDIR" || err "!findpath $TMPDIR")" || \ xbtmpchk="`findpath "$TMPDIR" || err "!findpath $TMPDIR"`" || \
err "!findpath '$TMPDIR'" xbmk_child_set_tmp "$@" err "!findpath '$TMPDIR'" xbmk_child_set_tmp "$@"
[ "$xbtmpchk" = "${xbtmpchk#"$basetmp/"}" ] && \ [ "$xbtmpchk" = "${xbtmpchk#"$basetmp/"}" ] && \
badtmp="not a subdirectory in $basetmp" badtmp="not a subdirectory in $basetmp"
@@ -136,7 +136,7 @@ xbmk_parent_check_tmp()
{ {
export TMPDIR="$basetmp" export TMPDIR="$basetmp"
xbmklist="$(mktemp || err "can't make tmplist")" || \ xbmklist="`mktemp || err "can't make tmplist"`" || \
err "can't make tmplist" xbmk_parent_check_tmp "$@" err "can't make tmplist" xbmk_parent_check_tmp "$@"
x_ rm -f "$xbmklist" x_ rm -f "$xbmklist"
x_ touch "$xbmklist" x_ touch "$xbmklist"
@@ -148,7 +148,7 @@ xbmk_parent_check_tmp()
done done
# set up a unified temporary directory, for common deletion later: # set up a unified temporary directory, for common deletion later:
export TMPDIR="$(x_ mktemp -d -t xbmk_XXXXXXXX)" || \ export TMPDIR="`x_ mktemp -d -t xbmk_XXXXXXXX`" || \
err "can't export TMPDIR" xbmk_parent_check_tmp "$@" err "can't export TMPDIR" xbmk_parent_check_tmp "$@"
xbtmp="$TMPDIR" xbtmp="$TMPDIR"
@@ -211,7 +211,7 @@ xbmk_set_pyver()
pybin python3 1>/dev/null || python="python" pybin python3 1>/dev/null || python="python"
pyver="2" && [ "$python" = "python3" ] && pyver="3" pyver="2" && [ "$python" = "python3" ] && pyver="3"
pybin "$python" 1>/dev/null || pyver="" pybin "$python" 1>/dev/null || pyver=""
[ -z "$pyver" ] || "$(x_ pybin "$python")" -c "$pyv" 1>/dev/null \ [ -z "$pyver" ] || "`x_ pybin "$python"`" -c "$pyv" 1>/dev/null \
2>/dev/null || err "Cannot detect host Python version." \ 2>/dev/null || err "Cannot detect host Python version." \
xbmk_set_pyver "$@" xbmk_set_pyver "$@"
[ -n "$pyver" ] && \ [ -n "$pyver" ] && \
@@ -224,7 +224,7 @@ xbmk_set_pyver()
# set up python v3.x in PATH, in case it's not set up correctly. # set up python v3.x in PATH, in case it's not set up correctly.
# see code above that detected the correct python3 command. # see code above that detected the correct python3 command.
x_ cd "$xbtmp/xbmkpath" x_ cd "$xbtmp/xbmkpath"
x_ ln -s "$(x_ pybin "$python")" python || err "can't make symlink" \ x_ ln -s "`x_ pybin "$python"`" python || err "can't make symlink" \
xbmk_set_pyver "$@" xbmk_set_pyver "$@"
) || err "Can't set up python symlink in $xbtmp/xbmkpath" \ ) || err "Can't set up python symlink in $xbtmp/xbmkpath" \
xbmk_set_pyver "$@"; : xbmk_set_pyver "$@"; :
@@ -243,7 +243,7 @@ pybin()
# ideally, don't rely on PATH or hardcoded paths if python venv. # ideally, don't rely on PATH or hardcoded paths if python venv.
# use the *real*, direct executable linked to by the venv symlink # use the *real*, direct executable linked to by the venv symlink
if [ $venv -gt 0 ] && [ -L "$(command -v "$1" 2>/dev/null)" ]; then if [ $venv -gt 0 ] && [ -L "`command -v "$1" 2>/dev/null`" ]; then
pypath="$(findpath \ pypath="$(findpath \
"$(command -v "$1" 2>/dev/null)" 2>/dev/null || :)" "$(command -v "$1" 2>/dev/null)" 2>/dev/null || :)"
[ -e "$pypath" ] && [ ! -d "$pypath" ] && \ [ -e "$pypath" ] && [ ! -d "$pypath" ] && \
@@ -278,7 +278,7 @@ xbmk_git_init()
"xbmk_git_init" "$@" "xbmk_git_init" "$@"
eval "$(setvars "$(x_ date -Rud @$versiondate)" cdate _nogit || err)" \ eval "$(setvars "$(x_ date -Rud @$versiondate)" cdate _nogit || err)" \
err "can't get date" "xbmk_git_init" "$@" || err "can't get date" "xbmk_git_init" "$@"
x_ git init 1>/dev/null 2>/dev/null x_ git init 1>/dev/null 2>/dev/null
x_ git add -A . 1>/dev/null 2>/dev/null x_ git add -A . 1>/dev/null 2>/dev/null
include/inject.sh
+6 -6
View File
@@ -12,15 +12,15 @@ cv="CONFIG_GBE_BIN_PATH"
[ -n "$cvxbmk" ] && cv="$cv $cvxbmk" [ -n "$cvxbmk" ] && cv="$cv $cvxbmk"
[ -n "$cvchk" ] && cv="$cv $cvchk" [ -n "$cvchk" ] && cv="$cv $cvchk"
eval "$(setvars "" archive boarddir IFD_platform ifdprefix tree new_mac \ eval "`setvars "" archive boarddir IFD_platform ifdprefix tree new_mac \
tmpromdir board xchanged $cv)" tmpromdir board xchanged $cv`"
inject() inject()
{ {
remkdir "$tmpromdel" remkdir "$tmpromdel"
[ $# -lt 1 ] && err "No options specified" "inject" "$@" [ $# -lt 1 ] && err "No options specified" "inject" "$@"
eval "$(setvars "" nuke new_mac xchanged)" eval "`setvars "" nuke new_mac xchanged`"
archive="$1"; archive="$1";
new_mac="xx:xx:xx:xx:xx:xx" new_mac="xx:xx:xx:xx:xx:xx"
@@ -54,7 +54,7 @@ check_release()
[ -L "$archive" ] && err "'$archive' is a symlink" "check_release" "$@" [ -L "$archive" ] && err "'$archive' is a symlink" "check_release" "$@"
e "$archive" f missing && err "'$archive' missing" "check_release" "$@" e "$archive" f missing && err "'$archive' missing" "check_release" "$@"
archivename="$(basename "$archive" || err "Can't get '$archive' name")" \ archivename="`basename "$archive" || err "Can't get '$archive' name"`" \
|| err "can't get '$archive' name" "check_release" "$@" || err "can't get '$archive' name" "check_release" "$@"
[ -z "$archivename" ] && \ [ -z "$archivename" ] && \
err "Can't determine archive name" "check_release" "$@" err "Can't determine archive name" "check_release" "$@"
@@ -76,7 +76,7 @@ check_target()
[ "$board" = "${board#serprog_}" ] || return 1 [ "$board" = "${board#serprog_}" ] || return 1
boarddir="$cbcfgsdir/$board" boarddir="$cbcfgsdir/$board"
eval "$(setcfg "$boarddir/target.cfg")" eval "`setcfg "$boarddir/target.cfg"`"
chkvars tree && x_ ./mk -d coreboot "$tree" chkvars tree && x_ ./mk -d coreboot "$tree"
ifdtool="elf/coreboot/$tree/ifdtool" ifdtool="elf/coreboot/$tree/ifdtool"
@@ -107,7 +107,7 @@ readkconfig()
{ {
x_ rm -f "$xbtmp/cbcfg" x_ rm -f "$xbtmp/cbcfg"
fx_ scankconfig x_ find "$boarddir/config" -type f fx_ scankconfig x_ find "$boarddir/config" -type f
eval "$(setcfg "$xbtmp/cbcfg" 1)" eval "`setcfg "$xbtmp/cbcfg" 1`"
setvfile "$@" || return 1; : setvfile "$@" || return 1; :
} }
include/lib.sh
+10 -10
View File
@@ -34,11 +34,11 @@ xbmk_sanitize_version()
{ {
[ -n "$version" ] || return 0; : [ -n "$version" ] || return 0; :
version="$(printf "%s\n" "$version" | sed -e 's/\t//g')" version="`printf "%s\n" "$version" | sed -e 's/\t//g'`"
version="$(printf "%s\n" "$version" | sed -e 's/\ //g')" version="`printf "%s\n" "$version" | sed -e 's/\ //g'`"
version="$(printf "%s\n" "$version" | sed -e 's/\.\.//g')" version="`printf "%s\n" "$version" | sed -e 's/\.\.//g'`"
version="$(printf "%s\n" "$version" | sed -e 's/\.\///g')" version="`printf "%s\n" "$version" | sed -e 's/\.\///g'`"
version="$(printf "%s\n" "$version" | sed -e 's/\//-/g')" version="`printf "%s\n" "$version" | sed -e 's/\//-/g'`"
version="${version#-}" version="${version#-}"
[ -n "$version" ] || err "'version' empty after sanitization" \ [ -n "$version" ] || err "'version' empty after sanitization" \
@@ -107,8 +107,8 @@ findpath()
{ {
[ $# -gt 0 ] || err "findpath: No arguments provided" "findpath" "$@" [ $# -gt 0 ] || err "findpath: No arguments provided" "findpath" "$@"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
found="$(readlink -f "$1" 2>/dev/null)" || return 1; : found="`readlink -f "$1" 2>/dev/null`" || return 1; :
[ -n "$found" ] || found="$(realpath "$1" 2>/dev/null)" || \ [ -n "$found" ] || found="`realpath "$1" 2>/dev/null`" || \
return 1; : return 1; :
printf "%s\n" "$found" printf "%s\n" "$found"
shift 1 shift 1
@@ -117,7 +117,7 @@ findpath()
pad_one_byte() pad_one_byte()
{ {
paddedfile="$(mktemp || err "mktemp pad_one_byte")" || \ paddedfile="`mktemp || err "mktemp pad_one_byte"`" || \
err "can't make tmp file" "pad_one_byte" "$@" err "can't make tmp file" "pad_one_byte" "$@"
x_ cat "$1" config/data/coreboot/0 > "$paddedfile" || \ x_ cat "$1" config/data/coreboot/0 > "$paddedfile" || \
err "could not pad file '$paddedfile'" "pad_one_byte" "$1"; : err "could not pad file '$paddedfile'" "pad_one_byte" "$1"; :
@@ -131,7 +131,7 @@ unpad_one_byte()
[ $xromsize -lt 524288 ] && \ [ $xromsize -lt 524288 ] && \
err "too small, $xromsize: $1" "unpad_one_byte" "$@" err "too small, $xromsize: $1" "unpad_one_byte" "$@"
unpaddedfile="$(mktemp || err "mktemp unpad_one_byte")" || \ unpaddedfile="`mktemp || err "mktemp unpad_one_byte"`" || \
err "can't make tmp file" "unpad_one_byte" "$@" err "can't make tmp file" "unpad_one_byte" "$@"
x_ dd if="$1" of="$unpaddedfile" bs=$xromsize count=1 x_ dd if="$1" of="$unpaddedfile" bs=$xromsize count=1
x_ mv "$unpaddedfile" "$1" x_ mv "$unpaddedfile" "$1"
@@ -140,7 +140,7 @@ unpad_one_byte()
fx_() fx_()
{ {
xchk fx_ "$@" xchk fx_ "$@"
fd="$(mktemp || err "can't create tmpfile")" || \ fd="`mktemp || err "can't create tmpfile"`" || \
err "can't make tmpfile" "fx_" "$@" err "can't make tmpfile" "fx_" "$@"
x_ rm -f "$fd" && x_ touch "$fd" x_ rm -f "$fd" && x_ touch "$fd"
xx="$1" && shift 1 xx="$1" && shift 1
include/mrc.sh
+1 -1
View File
@@ -4,7 +4,7 @@
# Modifications in this version are Copyright 2021,2023-2025 Leah Rowe. # Modifications in this version are Copyright 2021,2023-2025 Leah Rowe.
# Original copyright detailed in repo: https://review.coreboot.org/coreboot/ # Original copyright detailed in repo: https://review.coreboot.org/coreboot/
eval "$(setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board SHELLBALL)" eval "`setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board SHELLBALL`"
extract_refcode() extract_refcode()
{ {
include/release.sh
+2 -2
View File
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# Copyright (c) 2023-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2023-2025 Leah Rowe <leah@libreboot.org>
eval "$(setvars "" reldir reldest vdir rsrc relmode)" eval "`setvars "" reldir reldest vdir rsrc relmode`"
release() release()
{ {
@@ -22,7 +22,7 @@ release()
[ -e "$reldest" ] && \ [ -e "$reldest" ] && \
err "already exists: \"$reldest\"" "release" "$@" err "already exists: \"$reldest\"" "release" "$@"
vdir="$(mktemp -d || err "can't make vdir")" || \ vdir="`mktemp -d || err "can't make vdir"`" || \
err "can't make tmp vdir" "release" "$@" err "can't make tmp vdir" "release" "$@"
vdir="$vdir/$version" vdir="$vdir/$version"
include/rom.sh
+2 -2
View File
@@ -34,8 +34,8 @@ copyps1bios()
mkpayload_grub() mkpayload_grub()
{ {
eval "$(setvars "" grub_modules grub_install_modules)" eval "`setvars "" grub_modules grub_install_modules`"
$dry eval "$(setcfg "$grubdata/module/$tree")" $dry eval "`setcfg "$grubdata/module/$tree"`"
$dry x_ rm -f "$srcdir/grub.elf"; $dry \ $dry x_ rm -f "$srcdir/grub.elf"; $dry \
x_ "$srcdir/grub-mkstandalone" --grub-mkimage="$srcdir/grub-mkimage" \ x_ "$srcdir/grub-mkstandalone" --grub-mkimage="$srcdir/grub-mkimage" \
-O i386-coreboot -o "$srcdir/grub.elf" -d "${srcdir}/grub-core/" \ -O i386-coreboot -o "$srcdir/grub.elf" -d "${srcdir}/grub-core/" \
include/tree.sh
+10 -10
View File
@@ -3,11 +3,11 @@
# Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# Copyright (c) 2023-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2023-2025 Leah Rowe <leah@libreboot.org>
eval "$(setvars "" xarch srcdir premake gnatdir tree mode makeargs elfdir cmd \ eval "`setvars "" xarch srcdir premake gnatdir xlang mode makeargs elfdir cmd \
project target target_dir targets xtree _f release bootstrapargs mkhelper \ project target target_dir targets xtree _f release bootstrapargs mkhelper \
autoconfargs listfile autogenargs btype rev build_depend gccdir cmakedir \ autoconfargs listfile autogenargs btype rev build_depend gccdir cmakedir \
defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs gccver gccfull \ defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs gccver gccfull \
gnatver gnatfull do_make badhash badtghash xlang)" gnatver gnatfull do_make badhash badtghash tree`"
trees() trees()
{ {
@@ -130,16 +130,16 @@ handle_defconfig()
configure_project() configure_project()
{ {
eval "$(setvars "" cleanargs build_depend autoconfargs xtree postmake \ eval "`setvars "" cleanargs build_depend autoconfargs xtree postmake \
makeargs btype mkhelper bootstrapargs premake release xlang xarch \ makeargs btype mkhelper bootstrapargs premake release xlang xarch \
badhash badtghash)" badhash badtghash`"
_tcfg="$1/target.cfg" _tcfg="$1/target.cfg"
[ -f "$_tcfg" ] || btype="auto" [ -f "$_tcfg" ] || btype="auto"
e "$datadir/mkhelper.cfg" f && eval "$(setcfg "$datadir/mkhelper.cfg")" e "$datadir/mkhelper.cfg" f && eval "`setcfg "$datadir/mkhelper.cfg"`"
while e "$_tcfg" f || [ "$cmd" != "build_project" ]; do while e "$_tcfg" f || [ "$cmd" != "build_project" ]; do
eval "$(setvars "" rev tree)" eval "`setvars "" rev tree`"
eval "$(setcfg "$_tcfg")" eval "`setcfg "$_tcfg"`"
printf "Loading %s config: %s\n" "$project" "$_tcfg" printf "Loading %s config: %s\n" "$project" "$_tcfg"
[ "$_f" = "-d" ] && build_depend="" # dry run [ "$_f" = "-d" ] && build_depend="" # dry run
@@ -194,7 +194,7 @@ delete_old_project_files()
project_up_to_date() project_up_to_date()
{ {
eval "$(setvars "" old_hash hash)" eval "`setvars "" old_hash hash`"
hashdir="$1" hashdir="$1"
hashname="$2" hashname="$2"
badhashvar="$3" badhashvar="$3"
@@ -260,7 +260,7 @@ check_gnu_path()
command -v "$1" 1>/dev/null || \ command -v "$1" 1>/dev/null || \
err "Host '$1' unavailable" "check_gnu_path" "$@" err "Host '$1' unavailable" "check_gnu_path" "$@"
eval "$(setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir)" eval "`setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir`"
x_ gnu_setver "$1" "$1" || \ x_ gnu_setver "$1" "$1" || \
err "Command '$1' unavailable." "check_gnu_path" "$@" err "Command '$1' unavailable." "check_gnu_path" "$@"
gnu_setver "$2" "$2" || : gnu_setver "$2" "$2" || :
@@ -291,7 +291,7 @@ check_gnu_path()
gnu_setver() gnu_setver()
{ {
eval "$2 --version 1>/dev/null 2>/dev/null || return 1" eval "$2 --version 1>/dev/null 2>/dev/null || return 1"
eval "$1ver=\"$("$2" --version 2>/dev/null | head -n1)\"" eval "$1ver=\"`"$2" --version 2>/dev/null | head -n1`\""
eval "$1ver=\"\${$1ver##* }\"" eval "$1ver=\"\${$1ver##* }\""
eval "$1full=\"\$$1ver\"" eval "$1full=\"\$$1ver\""
eval "$1ver=\"\${$1ver%%.*}\""; : eval "$1ver=\"\${$1ver%%.*}\""; :
include/vendor.sh
+3 -3
View File
@@ -33,7 +33,7 @@ cvxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_FSP_FULL_FD \
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS" CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS"
# lbmk-specific extensions; mostly used for downloading vendor files # lbmk-specific extensions; mostly used for downloading vendor files
eval "$(setvars "" has_hashes EC_hash DL_hash _pre_dest MRC_refcode_gbe vcfg \ eval "`setvars "" has_hashes EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \ E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \
E6400_VGA_romname SCH5545EC_DL_url_bkup SCH5545EC_DL_hash _dest mecleaner \ E6400_VGA_romname SCH5545EC_DL_url_bkup SCH5545EC_DL_hash _dest mecleaner \
kbc1126_ec_dump MRC_refcode_cbtree _dl SCH5545EC_DL_url EC_url rom DL_url \ kbc1126_ec_dump MRC_refcode_cbtree _dl SCH5545EC_DL_url EC_url rom DL_url \
@@ -41,7 +41,7 @@ eval "$(setvars "" has_hashes EC_hash DL_hash _pre_dest MRC_refcode_gbe vcfg \
ME11version ME11sku ME11pch _me _metmp mfs TBFW_url_bkup TBFW_url cbdir \ ME11version ME11sku ME11pch _me _metmp mfs TBFW_url_bkup TBFW_url cbdir \
TBFW_hash TBFW_size hashfile EC_url_bkup FSPM_bin_hash FSPS_bin_hash \ TBFW_hash TBFW_size hashfile EC_url_bkup FSPM_bin_hash FSPS_bin_hash \
EC_FW1_hash EC_FW2_hash ME_bin_hash MRC_bin_hash REF_bin_hash _dl_bin \ EC_FW1_hash EC_FW2_hash ME_bin_hash MRC_bin_hash REF_bin_hash _dl_bin \
SCH5545EC_bin_hash TBFW_bin_hash E6400_VGA_bin_hash DL_url_bkup)" SCH5545EC_bin_hash TBFW_bin_hash E6400_VGA_bin_hash _pre_dest`"
download() download()
{ {
@@ -266,7 +266,7 @@ setvfile()
getvfile() getvfile()
{ {
eval "$(setcfg "config/vendor/$vcfg/pkg.cfg" 1)" eval "`setcfg "config/vendor/$vcfg/pkg.cfg" 1`"
bootstrap && [ $# -gt 0 ] && getfiles && return 0 # download bootstrap && [ $# -gt 0 ] && getfiles && return 0 # download
fx_ prep x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" fx_ prep x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
( check_vendor_hashes ) || \ ( check_vendor_hashes ) || \