summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-05-26 01:54:36 +0100
committerLeah Rowe <leah@libreboot.org>2024-05-26 07:22:44 +0100
commit5c14e8e1bca035e038365b65ab0a68acc98fd2d6 (patch)
treebe6e242123797e43de0c25db77681ab6f3f9e2a9 /include
parent48c2cef800eb6153f953f298a2d04e43577d6000 (diff)
general code cleanup in the build system
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rwxr-xr-xinclude/git.sh66
-rwxr-xr-xinclude/mrc.sh32
-rwxr-xr-xinclude/option.sh117
-rwxr-xr-xinclude/vendor.sh369
4 files changed, 282 insertions, 302 deletions
diff --git a/include/git.sh b/include/git.sh
index a1afcee8..f5aa34eb 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -1,34 +1,30 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2020,2021,2023,2024 Leah Rowe <leah@libreboot.org>
-# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
+# Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
+# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
eval "$(setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree \
mdir subrev subrepo subrepo_bkup)"
fetch_project_trees()
{
- _target="${target}"
- [ ! -d "src/${project}/${project}" ] && x_ mkdir -p "src/${project}" \
- && fetch_project_repo "${project}"
+ _target="$target"
+ [ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \
+ && fetch_project_repo "$project"
fetch_config
- if [ -d "src/${project}/${tree}" ]; then
- printf "download/%s %s (%s): exists\n" \
- "${project}" "${tree}" "${_target}" 1>&2
- return 0
- fi
+ e "src/$project/$tree" d && return 0
prepare_new_tree
}
fetch_config()
{
- rm -f "${cfgsdir}/"*/seen || $err "fetch_config ${cfgsdir}: !rm seen"
+ rm -f "$cfgsdir/"*/seen || $err "fetch_config $cfgsdir: !rm seen"
eval "$(setvars "" xtree tree_depend)"
while true; do
eval "$(setvars "" rev tree)"
- _xm="fetch_config ${project}/${_target}"
- load_target_config "${_target}"
- [ "${_target}" = "${tree}" ] && break
- _target="${tree}"
+ _xm="fetch_config $project/$_target"
+ load_target_config "$_target"
+ [ "$_target" = "$tree" ] && break
+ _target="$tree"
done
[ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \
x_ ./update trees -f "$project" "$tree_depend"; return 0
@@ -37,8 +33,7 @@ fetch_config()
load_target_config()
{
[ -f "$cfgsdir/$1/target.cfg" ] || $err "$1: target.cfg missing"
- [ -f "${cfgsdir}/${1}/seen" ] && \
- $err "${_xm} check: infinite loop in tree definitions"
+ [ -f "$cfgsdir/$1/seen" ] && $err "$_xm cfg: infinite loop in trees"
. "$cfgsdir/$1/target.cfg" || $err "load_target_config !$cfgsdir/$1"
touch "$cfgsdir/$1/seen" || $err "load_config $cfgsdir/$1: !mk seen"
@@ -48,8 +43,8 @@ prepare_new_tree()
{
printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
- cp -R "src/${project}/${project}" "${tmpgit}" || \
- $err "prepare_new_tree ${project}/${tree}: can't make tmpclone"
+ cp -R "src/$project/$project" "$tmpgit" || \
+ $err "prepare_new_tree $project/$tree: can't make tmpclone"
git_prep "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update"
}
@@ -57,28 +52,25 @@ fetch_project_repo()
{
eval "$(setvars "" xtree tree_depend)"
- scan_config "${project}" "config/git"
+ scan_config "$project" "config/git"
[ -z "${loc+x}" ] && $err "fetch_project_repo $project: loc not set"
[ -z "${url+x}" ] && $err "fetch_project_repo $project: url not set"
clone_project
- [ -z "${depend}" ] || for d in ${depend} ; do
- x_ ./update trees -f ${d}
+ [ -z "$depend" ] || for d in $depend ; do
+ x_ ./update trees -f $d
done
- rm -Rf "${tmpgit}" || $err "fetch_repo: !rm -Rf ${tmpgit}"
+ rm -Rf "$tmpgit" || $err "fetch_repo: !rm -Rf $tmpgit"
}
clone_project()
{
loc="${loc#src/}"
- loc="src/${loc}"
- if [ -d "${loc}" ]; then
- printf "%s already exists, so skipping download\n" "$loc" 1>&2
- return 0
- fi
+ loc="src/$loc"
+ e "$loc" d && return 0
git clone $url "$tmpgit" || git clone $bkup_url "$tmpgit" \
- || $err "clone_project: could not download ${project}"
+ || $err "clone_project: could not download $project"
git_prep "$PWD/config/$project/patches" "$loc"
}
@@ -108,7 +100,7 @@ prep_submodules()
{
[ -f "$tmpgit/.gitmodules" ] || return 0
- mdir="${PWD}/config/submodule/$project"
+ mdir="$PWD/config/submodule/$project"
[ -n "$tree" ] && mdir="$mdir/$tree"
if [ -f "$mdir/module.list" ]; then
@@ -137,8 +129,7 @@ fetch_submodule()
$err "! . $mcfgdir/module.cfg"
if [ -n "$subrepo" ] || [ -n "$subrepo_bkup" ]; then
- [ -n "$subrev" ] || \
- $err "$1 as per $mdir: subrev not defined"
+ [ -n "$subrev" ] || $err "$1, $mdir: subrev not defined"
rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'"
for mod in "$subrepo" "$subrepo_bkup"; do
@@ -149,16 +140,15 @@ fetch_submodule()
done
[ -d "$tmpgit/$1" ] || $err "!clone $mod $project $mcfgdir $1"
else
- git -C "$tmpgit" submodule update --init --checkout -- "$1" || \
- $err "$mdir: !update $1"
+ git -C "$tmpgit" submodule update --init --checkout -- "$1" \
+ || $err "$mdir: !update $1"
fi
}
patch_submodule()
{
- [ -z "$subrev" ] || \
- git -C "$tmpgit/$1" reset --hard "$subrev" || \
- $err "$mdir $1: cannot reset git revision"
+ [ -z "$subrev" ] || git -C "$tmpgit/$1" reset --hard "$subrev" || \
+ $err "$mdir $1: cannot reset git revision"
git_am_patches "$tmpgit/$1" "$mdir/${1##*/}/patches"
}
@@ -167,7 +157,7 @@ git_am_patches()
{
for _patch in "$2/"*; do
[ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \
- "$_patch" || $err "git_am $1 $2: !git am $_patch"; continue
+ "$_patch" || $err "$1 $2: !git am $_patch"; continue
done
for _patches in "$2/"*; do
[ ! -L "$_patches" ] && [ -d "$_patches" ] && \
diff --git a/include/mrc.sh b/include/mrc.sh
index 62d30a70..caf893a7 100755
--- a/include/mrc.sh
+++ b/include/mrc.sh
@@ -9,19 +9,18 @@ eval "$(setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board SHELLBALL)"
extract_mrc()
{
[ -z "$MRC_board" ] && $err "extract_mrc $MRC_hash: MRC_board not set"
- [ -z "${CONFIG_MRC_FILE}" ] && \
- $err "extract_mrc $MRC_hash: CONFIG_MRC_FILE not set"
+ [ -z "$CONFIG_MRC_FILE" ] && $err "$MRC_hash: CONFIG_MRC_FILE unset"
- SHELLBALL="chromeos-firmwareupdate-${MRC_board}"
+ SHELLBALL="chromeos-firmwareupdate-$MRC_board"
(
- x_ cd "${appdir}"
+ x_ cd "$appdir"
extract_partition "${MRC_url##*/}"
- extract_archive "${SHELLBALL}" .
+ extract_archive "$SHELLBALL" .
) || $err "mrc download/extract failure"
- "${cbfstool}" "${appdir}/"bios.bin extract -n mrc.bin \
- -f "$_dest" -r RO_SECTION || $err "extract_mrc: cbfstool $_dest"
+ "$cbfstool" "$appdir/"bios.bin extract -n mrc.bin \
+ -f "$_dest" -r RO_SECTION || $err "extract_mrc: !$cbfstool $_dest"
[ -n "$CONFIG_REFCODE_BLOB_FILE" ] && extract_refcode; return 0
}
@@ -32,29 +31,26 @@ extract_partition()
ROOTP=$( printf "unit\nB\nprint\nquit\n" | \
parted "${1%.zip}" 2>/dev/null | grep "ROOT-A" )
- START=$(( $( echo ${ROOTP} | cut -f2 -d\ | tr -d "B" ) ))
- SIZE=$(( $( echo ${ROOTP} | cut -f4 -d\ | tr -d "B" ) ))
+ START=$(( $( echo $ROOTP | cut -f2 -d\ | tr -d "B" ) ))
+ SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) ))
- dd if="${1%.zip}" of="root-a.ext2" bs=1024 \
- skip=$(( ${START} / 1024 )) count=$(( ${SIZE} / 1024 )) || \
- $err "extract_partition, dd ${1%.zip}, root-a.ext2"
+ dd if="${1%.zip}" of="root-a.ext2" bs=1024 skip=$(( $START / 1024 )) \
+ count=$(( $SIZE / 1024 )) || $err "ex dd ${1%.zip}, root-a.ext2"
- printf "cd /usr/sbin\ndump chromeos-firmwareupdate ${SHELLBALL}\nquit" \
+ printf "cd /usr/sbin\ndump chromeos-firmwareupdate $SHELLBALL\nquit" \
| debugfs "root-a.ext2" || $err "can't extract shellball"
}
extract_refcode()
{
_refdest="${CONFIG_REFCODE_BLOB_FILE##*../}"
- [ -f "$_refdest" ] && return 0
+ e "$_refdest" f && return 0
# cbfstool changed the attributes scheme for stage files,
# incompatible with older versions before coreboot 4.14,
# so we need coreboot 4.13 cbfstool for certain refcode files
- [ -n "$cbfstoolref" ] || \
- $err "extract_refcode $board: MRC_refcode_cbtree not set"
- mkdir -p "${_refdest%/*}" || \
- $err "extract_refcode $board: !mkdir -p ${_refdest%/*}"
+ [ -n "$cbfstoolref" ] || $err "$board: MRC_refcode_cbtree not set"
+ mkdir -p "${_refdest%/*}" || $err "ref: !mkdir -p ${_refdest%/*}"
"$cbfstoolref" "$appdir/bios.bin" extract \
-m x86 -n fallback/refcode -f "$_refdest" -r RO_SECTION \
diff --git a/include/option.sh b/include/option.sh
index 6ab27354..eff55511 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-only
-# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
-# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-# SPDX-FileCopyrightText: 2020-2024 Leah Rowe <leah@libreboot.org>
+# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
+# Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Copyright (c) 2020-2024 Leah Rowe <leah@libreboot.org>
export LC_COLLATE=C
export LC_ALL=C
@@ -13,13 +13,13 @@ ifdtool="cbutils/default/ifdtool"
cbfstool="cbutils/default/cbfstool"
grubcfgsdir="config/grub"
layoutdir="/boot/grub/layouts"
-. "${grubcfgsdir}/modules.list"
-tmpgit="${PWD}/tmp/gitclone"
+. "$grubcfgsdir/modules.list"
+tmpgit="$PWD/tmp/gitclone"
err="err_"
err_()
{
- printf "ERROR %s: %s\n" "${0}" "${1}" 1>&2
+ printf "ERROR %s: %s\n" "$0" "$1" 1>&2
exit 1
}
@@ -27,14 +27,14 @@ setvars()
{
_setvars=""
[ $# -lt 2 ] && $err "setvars: too few arguments"
- val="${1}" && shift 1
+ val="$1" && shift 1
for var in $@; do
- _setvars="${var}=\"${val}\"; ${_setvars}"
+ _setvars="$var=\"$val\"; $_setvars"
done
printf "%s\n" "${_setvars% }"
}
-eval "$(setvars "" versiondate tmpdir _nogit version board boarddir \
- xbmk_release threads projectname relname)"
+eval "$(setvars "" xbmk_release tmpdir _nogit version board boarddir relname \
+ versiondate threads projectname)"
# if "y": a coreboot target won't be built if target.cfg says release="n"
# (this is used to exclude certain build targets from releases)
@@ -44,16 +44,16 @@ set | grep XBMK_RELEASE 1>/dev/null 2>/dev/null || xbmk_release="n" || :
export XBMK_RELEASE="$xbmk_release"
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
-if [ "${tmpdir_was_set}" = "y" ]; then
+if [ "$tmpdir_was_set" = "y" ]; then
[ "${TMPDIR%_*}" = "/tmp/xbmk" ] || tmpdir_was_set="n"
fi
-if [ "${tmpdir_was_set}" = "n" ]; then
+if [ "$tmpdir_was_set" = "n" ]; then
export TMPDIR="/tmp"
tmpdir="$(mktemp -d -t xbmk_XXXXXXXX)"
- export TMPDIR="${tmpdir}"
+ export TMPDIR="$tmpdir"
else
- export TMPDIR="${TMPDIR}"
- tmpdir="${TMPDIR}"
+ export TMPDIR="$TMPDIR"
+ tmpdir="$TMPDIR"
fi
set | grep XBMK_THREADS 1>/dev/null 2>/dev/null && threads="$XBMK_THREADS"
@@ -63,7 +63,7 @@ expr "X$threads" : "X-\{0,1\}[0123456789][0123456789]*$" \
export XBMK_THREADS="$threads"
x_() {
- [ $# -lt 1 ] || ${@} || $err "Unhandled non-zero exit: $@"; return 0
+ [ $# -lt 1 ] || $@ || $err "Unhandled non-zero exit: $@"; return 0
}
[ -e ".git" ] || [ -f "version" ] || printf "unknown\n" > version || \
@@ -73,53 +73,49 @@ x_() {
read -r projectname < projectname || :
[ ! -f version ] || read -r version < version || :
-version_="${version}"
+version_="$version"
[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
- version="git-$(git rev-parse HEAD 2>&1)" || version="${version_}"
+ version="git-$(git rev-parse HEAD 2>&1)" || version="$version_"
[ ! -f versiondate ] || read -r versiondate < versiondate || :
-versiondate_="${versiondate}"
+versiondate_="$versiondate"
[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
- --pretty='%ct' HEAD)" || versiondate="${versiondate_}"
+ --pretty='%ct' HEAD)" || versiondate="$versiondate_"
for p in projectname version versiondate; do
eval "[ -n \"\$$p\" ] || $err \"$p unset\""
eval "x_ printf \"%s\\n\" \"\$$p\" > $p"
done
-relname="${projectname}-${version}"
-export LOCALVERSION="-${projectname}-${version%%-*}"
+relname="$projectname-$version"
+export LOCALVERSION="-$projectname-${version%%-*}"
items()
{
rval=1
- if [ ! -d "${1}" ]; then
- printf "items: directory '%s' doesn't exist" "${1}" 1>&2
- return 1
- fi
- for x in "${1}/"*; do
+ e "$1" d not && return 1
+ for x in "$1/"*; do
# -e used because this is for files *or* directories
- [ -e "${x}" ] || continue
+ [ -e "$x" ] || continue
[ "${x##*/}" = "build.list" ] && continue
printf "%s\n" "${x##*/}" 2>/dev/null
rval=0
done
- return ${rval}
+ return $rval
}
scan_config()
{
- awkstr=" /\{.*${1}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }"
- confdir="${2}"
+ awkstr=" /\{.*$1.*}{/ {flag=1;next} /\}/{flag=0} flag { print }"
+ confdir="$2"
revfile="$(mktemp -t sources.XXXXXXXXXX)"
- cat "${confdir}/"* > "${revfile}" || \
- $err "scan_config ${confdir}: Cannot concatenate files"
+ cat "$confdir/"* > "$revfile" || $err "$confdir: can't cat files"
while read -r line ; do
- set ${line} 1>/dev/null 2>/dev/null || :
+ set $line 1>/dev/null 2>/dev/null || :
if [ "${1%:}" = "depend" ]; then
- depend="${depend} ${2}"
+ depend="$depend $2"
else
- eval "${1%:}=\"${2}\""
+ eval "${1%:}=\"$2\""
fi
done << EOF
- $(eval "awk '${awkstr}' \"${revfile}\"")
+ $(eval "awk '$awkstr' \"$revfile\"")
EOF
rm -f "$revfile" || $err "scan_config: Cannot remove tmpfile"
}
@@ -127,27 +123,26 @@ EOF
check_defconfig()
{
[ -d "$1" ] || $err "Target '$1' not defined."
- for x in "${1}"/config/*; do
- [ -f "${x}" ] && printf "%s\n" "$x" && return 1
+ for x in "$1"/config/*; do
+ [ -f "$x" ] && printf "%s\n" "$x" && return 1
done
}
handle_coreboot_utils()
{
for util in cbfstool ifdtool; do
- x_ ./update trees ${_f} "src/coreboot/${1}/util/${util}"
- [ -z "${mode}" ] && [ ! -f "cbutils/${1}/${util}" ] && \
- x_ mkdir -p "cbutils/${1}" && \
- x_ cp "src/coreboot/${1}/util/${util}/${util}" \
- "cbutils/${1}"
- [ -z "${mode}" ] || x_ rm -Rf "cbutils/${1}"
+ x_ ./update trees $_f "src/coreboot/$1/util/$util"
+ [ -z "$mode" ] && [ ! -f "cbutils/$1/$util" ] && \
+ x_ mkdir -p "cbutils/$1" && \
+ x_ cp "src/coreboot/$1/util/$util/$util" "cbutils/$1"
+ [ -z "$mode" ] || x_ rm -Rf "cbutils/$1"
done
}
remkdir()
{
- rm -Rf "${1}" || $err "remkdir: !rm -Rf \"${1}\""
- mkdir -p "${1}" || $err "remkdir: !mkdir -p \"${1}\""
+ rm -Rf "$1" || $err "remkdir: !rm -Rf \"$1\""
+ mkdir -p "$1" || $err "remkdir: !mkdir -p \"$1\""
}
git_err()
@@ -158,9 +153,9 @@ git_err()
mkrom_tarball()
{
- printf "%s\n" "${version}" > "${1}/version" || $err "$1 !version"
- printf "%s\n" "${versiondate}" > "${1}/versiondate" || $err "$1 !vdate"
- printf "%s\n" "${projectname}" > "${1}/projectname" || $err "$1 !pname"
+ printf "%s\n" "$version" > "$1/version" || $err "$1 !version"
+ printf "%s\n" "$versiondate" > "$1/versiondate" || $err "$1 !vdate"
+ printf "%s\n" "$projectname" > "$1/projectname" || $err "$1 !pname"
mktarball "$1" "${1%/*}/${relname}_${1##*/}.tar.xz"
x_ rm -Rf "$1"
@@ -168,20 +163,20 @@ mkrom_tarball()
mktarball()
{
- [ "${2%/*}" = "${2}" ] || \
+ [ "${2%/*}" = "$2" ] || \
mkdir -p "${2%/*}" || $err "mk, !mkdir -p \"${2%/*}\""
printf "\nCreating archive: %s\n\n" "$2"
tar -c "$1" | xz -T$threads -9e > "$2" || \
$err "mktarball 2, $1"
- mksha512sum "${2}" "${2##*/}.sha512"
+ mksha512sum "$2" "${2##*/}.sha512"
}
mksha512sum()
{
(
- [ "${1%/*}" != "${1}" ] && x_ cd "${1%/*}"
- sha512sum ./"${1##*/}" >> "${2}" || \
- $err "!sha512sum \"${1}\" > \"${2}\""
+ [ "${1%/*}" != "$1" ] && x_ cd "${1%/*}"
+ sha512sum ./"${1##*/}" >> "$2" || \
+ $err "!sha512sum \"$1\" > \"$2\""
) || $err "failed to create tarball checksum"
}
@@ -193,3 +188,15 @@ rmgit()
find . -name ".gitmodules" -exec rm -Rf {} + || $err "!rm .gitmod $1"
) || $err "Cannot remove .git/.gitmodules in $1"
}
+
+e()
+{
+ es_t="e"
+ [ $# -gt 1 ] && es_t="$2"
+ es2=""
+ estr="[ -$es_t \"\$1\" ] || return 1"
+ [ $# -gt 2 ] && estr="[ -$es_t \"\$1\" ] && return 1" && es2="not "
+
+ eval "$estr"
+ printf "%s %sfound\n" "$1" "$es2" 1>&2
+}
diff --git a/include/vendor.sh b/include/vendor.sh
index 5ab04221..9c3e294e 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -1,27 +1,27 @@
# SPDX-License-Identifier: GPL-3.0-only
-# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
-# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-# SPDX-FileCopyrightText: 2023-2024 Leah Rowe <leah@libreboot.org>
+# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
+# Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Copyright (c) 2023-2024 Leah Rowe <leah@libreboot.org>
_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
_7ztest="a"
-e6400_unpack="${PWD}/src/bios_extract/dell_inspiron_1100_unpacker.py"
-me7updateparser="${PWD}/util/me7_update_parser/me7_update_parser.py"
-pfs_extract="${PWD}/src/biosutilities/Dell_PFS_Extract.py"
-uefiextract="${PWD}/src/uefitool/uefiextract"
+e6400_unpack="$PWD/src/bios_extract/dell_inspiron_1100_unpacker.py"
+me7updateparser="$PWD/util/me7_update_parser/me7_update_parser.py"
+pfs_extract="$PWD/src/biosutilities/Dell_PFS_Extract.py"
+uefiextract="$PWD/src/uefitool/uefiextract"
nvmutil="util/nvmutil/nvm"
vendir="vendorfiles"
-appdir="${vendir}/app"
+appdir="$vendir/app"
eval "$(setvars "" _b EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \
E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \
- E6400_VGA_romname SCH5545EC_DL_url SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \
- mecleaner kbc1126_ec_dump MRC_refcode_cbtree new_mac _dl CONFIG_HAVE_MRC \
- CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_ME_BIN archive EC_url modifygbe \
- CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 _dest tree \
- CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET rom \
- CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_GBE_BIN_PATH release DL_url \
+ E6400_VGA_romname CONFIG_HAVE_MRC SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \
+ mecleaner kbc1126_ec_dump MRC_refcode_cbtree new_mac _dl SCH5545EC_DL_url \
+ CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_ME_BIN archive EC_url modifygbe rom \
+ CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE _dest tree CONFIG_GBE_BIN_PATH \
+ CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \
+ CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 release DL_url \
CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE nukemode \
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB cbfstoolref \
CONFIG_REFCODE_BLOB_FILE)"
@@ -29,15 +29,15 @@ eval "$(setvars "" _b EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \
vendor_download()
{
set +u +e
- export PATH="${PATH}:/sbin"
+ export PATH="$PATH:/sbin"
[ $# -gt 0 ] || $err "No argument given"
- board="${1}"
- boarddir="${cbcfgsdir}/${board}"
+ board="$1"
+ boarddir="$cbcfgsdir/$board"
_b="${board%%_*mb}" # shorthand (no duplication per rom size)
detect_firmware && exit 0
- scan_config "${_b}" "config/vendor"
+ scan_config "$_b" "config/vendor"
build_dependencies_download
download_vendorfiles
@@ -46,93 +46,91 @@ vendor_download()
detect_firmware()
{
[ -d "$boarddir" ] || $err "Target '$board' not defined."
- . "$(check_defconfig "${boarddir}")" 2>/dev/null || exit 0
- . "${boarddir}/target.cfg" 2>/dev/null
+ . "$(check_defconfig "$boarddir")" 2>/dev/null || exit 0
+ . "$boarddir/target.cfg" 2>/dev/null
[ -z "$tree" ] && $err "detect_firmware $boarddir: tree undefined"
cbdir="src/coreboot/$tree"
cbfstool="cbutils/$tree/cbfstool"
- mecleaner="${PWD}/${cbdir}/util/me_cleaner/me_cleaner.py"
- kbc1126_ec_dump="${PWD}/${cbdir}/util/kbc1126/kbc1126_ec_dump"
+ mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
+ kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \
CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do
- eval "[ -z \"\${${c}}\" ] || return 1"
+ eval "[ -z \"\${$c}\" ] || return 1"
done
- printf "Vendor files not needed for: %s\n" "${board}" 1>&2
+ printf "Vendor files not needed for: %s\n" "$board" 1>&2
}
build_dependencies_download()
{
- [ -d "${cbdir}" ] || x_ ./update trees -f coreboot ${cbdir##*/}
+ [ -d "$cbdir" ] || x_ ./update trees -f coreboot ${cbdir##*/}
for d in uefitool biosutilities bios_extract; do
- [ -d "src/${d}" ] && continue
- x_ ./update trees -f "${d}"
+ [ -d "src/$d" ] && continue
+ x_ ./update trees -f "$d"
done
- [ -f "${uefiextract}" ] || x_ ./update trees -b uefitool
- [ ! -d "${kbc1126_ec_dump%/*}" ] || [ -f "${kbc1126_ec_dump}" ] || x_ \
- make -C "${cbdir}/util/kbc1126"
+ [ -f "$uefiextract" ] || x_ ./update trees -b uefitool
+ [ ! -d "${kbc1126_ec_dump%/*}" ] || [ -f "$kbc1126_ec_dump" ] || x_ \
+ make -C "$cbdir/util/kbc1126"
[ -n "$MRC_refcode_cbtree" ] && \
cbfstoolref="cbutils/$MRC_refcode_cbtree/cbfstool"
[ -z "$cbfstoolref" ] || [ -f "$cbfstoolref" ] || \
x_ ./update trees -b coreboot utils $MRC_refcode_cbtree
- [ -f "${cbfstool}" ] && [ -f "${ifdtool}" ] && return 0
+ [ -f "$cbfstool" ] && [ -f "$ifdtool" ] && return 0
x_ ./update trees -b coreboot utils $tree
}
download_vendorfiles()
{
- [ -z "${CONFIG_HAVE_ME_BIN}" ] || \
- fetch intel_me "$DL_url" "$DL_url_bkup" "$DL_hash" \
- "${CONFIG_ME_BIN_PATH}"
- [ -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"
- [ -z "${CONFIG_KBC1126_FIRMWARE}" ] || \
- fetch kbc1126ec "$EC_url" "$EC_url_bkup" "$EC_hash" \
- "${CONFIG_KBC1126_FW1}"
- [ -z "${CONFIG_VGA_BIOS_FILE}" ] || \
- fetch "e6400vga" "$E6400_VGA_DL_url" "$E6400_VGA_DL_url_bkup" \
- "$E6400_VGA_DL_hash" "$CONFIG_VGA_BIOS_FILE"
- [ -z "${CONFIG_HAVE_MRC}" ] && return 0
- fetch "mrc" "$MRC_url" "$MRC_url_bkup" "$MRC_hash" "$CONFIG_MRC_FILE"
+ [ -z "$CONFIG_HAVE_ME_BIN" ] || fetch intel_me "$DL_url" \
+ "$DL_url_bkup" "$DL_hash" "$CONFIG_ME_BIN_PATH"
+ [ -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"
+ [ -z "$CONFIG_KBC1126_FIRMWARE" ] || fetch kbc1126ec "$EC_url" \
+ "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW1"
+ [ -z "$CONFIG_VGA_BIOS_FILE" ] || fetch "e6400vga" \
+ "$E6400_VGA_DL_url" "$E6400_VGA_DL_url_bkup" "$E6400_VGA_DL_hash" \
+ "$CONFIG_VGA_BIOS_FILE"
+ [ -z "$CONFIG_HAVE_MRC" ] || fetch "mrc" "$MRC_url" "$MRC_url_bkup" \
+ "$MRC_hash" "$CONFIG_MRC_FILE"; return 0
}
fetch()
{
- dl_type="${1}"
- dl="${2}"
- dl_bkup="${3}"
- dlsum="${4}"
- [ "${5}" = "/dev/null" ] && return 0
+ dl_type="$1"
+ dl="$2"
+ dl_bkup="$3"
+ dlsum="$4"
+ [ "$5" = "/dev/null" ] && return 0
[ "${5# }" = "$5" ] || $err "fetch: space not allowed in _dest: '$5'"
[ "${5#/}" = "$5" ] || $err "fetch: absolute path not allowed: '$5'"
_dest="${5##*../}"
- _dl="${vendir}/cache/${dlsum}"
+ _dl="$vendir/cache/$dlsum"
dl_fail="n"
x_ mkdir -p "${_dl%/*}"
dl_fail="y"
- vendor_checksum "${dlsum}" "${_dl}" || dl_fail="n"
- for url in "${dl}" "${dl_bkup}"; do
- [ "${dl_fail}" = "n" ] && break
- [ -z "${url}" ] && continue
- x_ rm -f "${_dl}"
+ vendor_checksum "$dlsum" "$_dl" || dl_fail="n"
+ for url in "$dl" "$dl_bkup"; do
+ [ "$dl_fail" = "n" ] && break
+ [ -z "$url" ] && continue
+ x_ rm -f "$_dl"
curl --location --retry 3 -A "$_ua" "$url" -o "$_dl" || \
wget --tries 3 -U "$_ua" "$url" -O "$_dl" || continue
- vendor_checksum "${dlsum}" "${_dl}" || dl_fail="n"
+ vendor_checksum "$dlsum" "$_dl" || dl_fail="n"
done
- [ "${dl_fail}" = "y" ] && \
- $err "fetch ${dlsum}: matched file unavailable"
+ [ "$dl_fail" = "y" ] && \
+ $err "fetch $dlsum: matched file unavailable"
x_ rm -Rf "${_dl}_extracted"
- mkdirs "${_dest}" "extract_${dl_type}" || return 0
- eval "extract_${dl_type}"
+ mkdirs "$_dest" "extract_$dl_type" || return 0
+ eval "extract_$dl_type"
- [ -f "${_dest}" ] && return 0
- $err "extract_${dl_type} (fetch): missing file: '${_dest}'"
+ [ -f "$_dest" ] && return 0
+ $err "extract_$dl_type (fetch): missing file: '$_dest'"
}
vendor_checksum()
@@ -144,26 +142,24 @@ vendor_checksum()
mkdirs()
{
- if [ -f "${1}" ]; then
- printf "mkdirs %s %s: already downloaded\n" "$1" "$2" 1>&2
- return 1
- fi
+ e "$1" f && return 1
+
mkdir -p "${1%/*}" || $err "mkdirs: !mkdir -p ${1%/*}"
- remkdir "${appdir}"
- extract_archive "${_dl}" "${appdir}" || \
- [ "${2}" = "extract_e6400vga" ] || \
- $err "mkdirs ${1} ${2}: !extract"
+ remkdir "$appdir"
+ extract_archive "$_dl" "$appdir" || \
+ [ "$2" = "extract_e6400vga" ] || \
+ $err "mkdirs $1 $2: !extract"
}
extract_intel_me()
{
- [ ! -f "$mecleaner" ] && \
- $err "extract_intel_me $cbdir: me_cleaner missing"
+ e "$mecleaner" f not && $err "$cbdir: me_cleaner missing"
+
+ _me="$PWD/$_dest" # must always be an absolute path
+ cdir="$PWD/$appdir" # must always be an absolute path
+ [ $# -gt 0 ] && _me="${1}" && cdir="$2"
- _me="${PWD}/${_dest}" # must always be an absolute path
- cdir="${PWD}/${appdir}" # must always be an absolute path
- [ $# -gt 0 ] && _me="${1}" && cdir="${2}"
- [ -f "${_me}" ] && return 0
+ e "$_me" f && return 0
sdir="$(mktemp -d)"
[ -z "$sdir" ] && return 0
@@ -175,30 +171,30 @@ extract_intel_me()
[ -f "$_me" ] && break
[ -L "$i" ] && continue
if [ -f "$i" ]; then
- "$mecleaner" -r -t -O "${sdir}/vendorfile" \
+ "$mecleaner" -r -t -O "$sdir/vendorfile" \
-M "$_me" "$i" && break
"$mecleaner" -r -t -O "$_me" "$i" && break
"$me7updateparser" -O "$_me" "$i" && break
_7ztest="${_7ztest}a"
extract_archive "$i" "$_7ztest" || continue
- extract_intel_me "$_me" "${cdir}/${_7ztest}"
+ extract_intel_me "$_me" "$cdir/$_7ztest"
elif [ -d "$i" ]; then
- extract_intel_me "$_me" "${cdir}/${i}"
+ extract_intel_me "$_me" "$cdir/$i"
else
continue
fi
- cdir="${1}"
+ cdir="$1"
[ "${cdir#/a}" != "$cdir" ] && cdir="${cdir#/}"
- cd "${cdir}" || :
+ cd "$cdir" || :
done
)
- rm -Rf "${sdir}" || $err "extract_intel_me: !rm -Rf ${sdir}"
+ rm -Rf "$sdir" || $err "extract_intel_me: !rm -Rf $sdir"
}
extract_archive()
{
- innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x "$1" \
- -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1
+ innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
+ "$1" -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1
}
extract_kbc1126ec()
@@ -206,58 +202,51 @@ extract_kbc1126ec()
[ ! -f "$kbc1126_ec_dump" ] && \
$err "extract_kbc1126ec $cbdir: kbc1126_ec_dump missing"
(
- x_ cd "${appdir}/"
+ x_ cd "$appdir/"
mv Rompaq/68*.BIN ec.bin || :
if [ ! -f ec.bin ]; then
unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \
unar -D 68*.CAB Rom.bin || $err "can't extract Rom.bin"
x_ mv Rom.bin ec.bin
fi
- [ -f ec.bin ] || $err "extract_kbc1126_ec ${board}: can't extract"
- "${kbc1126_ec_dump}" ec.bin || \
- $err "extract_kbc1126_ec ${board}: can't extract ecfw1/2.bin"
+ [ -f ec.bin ] || $err "extract_kbc1126_ec $board: can't extract"
+ "$kbc1126_ec_dump" ec.bin || $err "!1126ec $board extract ecfw"
) || $err "can't extract kbc1126 ec firmware"
- ec_ex="y"
- for i in 1 2; do
- [ -f "${appdir}/ec.bin.fw${i}" ] || ec_ex="n"
- done
- [ "${ec_ex}" = "y" ] || \
- $err "extract_kbc1126_ec ${board}: didn't extract ecfw1/2.bin"
- cp "${appdir}/"ec.bin.fw* "${_dest%/*}/" || \
- $err "extract_kbc1126_ec ${board}: can't copy ec binaries"
+
+ e "$appdir/ec.bin.fw1" f not && $err "$board: kbc1126ec fetch failed"
+ e "$appdir/ec.bin.fw2" f not && $err "$board: kbc1126ec fetch failed"
+
+ cp "$appdir/"ec.bin.fw* "${_dest%/*}/" || $err "!cp 1126ec $_dest"
}
extract_e6400vga()
{
for v in E6400_VGA_offset E6400_VGA_romname; do
- eval "[ -z \"\$$v\" ] && $err \"extract_e6400vga: $v undefined\""
+ eval "[ -z \"\$$v\" ] && $err \"e6400vga: $v undefined\""
done
tail -c +$E6400_VGA_offset "$_dl" | gunzip > "$appdir/bios.bin" || :
(
- x_ cd "${appdir}"
+ x_ cd "$appdir"
[ -f "bios.bin" ] || $err "extract_e6400vga: can't extract bios.bin"
- "${e6400_unpack}" bios.bin || printf "TODO: fix dell extract util\n"
- [ -f "${E6400_VGA_romname}" ] || \
+ "$e6400_unpack" bios.bin || printf "TODO: fix dell extract util\n"
+ [ -f "$E6400_VGA_romname" ] || \
$err "extract_e6400vga: can't extract vga rom from bios.bin"
) || $err "can't extract e6400 vga rom"
- cp "${appdir}/${E6400_VGA_romname}" "${_dest}" || \
- $err "extract_e6400vga ${board}: can't copy vga rom to ${_dest}"
+ cp "$appdir/$E6400_VGA_romname" "$_dest" || \
+ $err "extract_e6400vga $board: can't copy vga rom to $_dest"
}
extract_sch5545ec()
{
# full system ROM (UEFI), to extract with UEFIExtract:
- _bios="${_dl}_extracted/Firmware/1 ${dlsum} -- 1 System BIOS vA.28.bin"
+ _bios="${_dl}_extracted/Firmware/1 $dlsum -- 1 System BIOS vA.28.bin"
# this is the SCH5545 firmware, inside of the extracted UEFI ROM:
- _sch5545ec_fw="${_bios}.dump/4 7A9354D9-0468-444A-81CE-0BF617D890DF"
- _sch5545ec_fw="${_sch5545ec_fw}/54 D386BEB8-4B54-4E69-94F5-06091F67E0D3"
- _sch5545ec_fw="${_sch5545ec_fw}/0 Raw section/body.bin" # <-- this!
-
- # this makes the file defined by _sch5545ec_fw available to copy
- "${uefiextract}" "${_bios}" || \
- $err "extract_sch5545ec: cannot extract from uefi image"
- cp "${_sch5545ec_fw}" "${_dest}" || \
- $err "extract_sch5545ec: cannot copy sch5545ec firmware file"
+ _sch5545ec_fw="$_bios.dump/4 7A9354D9-0468-444A-81CE-0BF617D890DF"
+ _sch5545ec_fw="$_sch5545ec_fw/54 D386BEB8-4B54-4E69-94F5-06091F67E0D3"
+ _sch5545ec_fw="$_sch5545ec_fw/0 Raw section/body.bin" # <-- this!
+
+ "$uefiextract" "$_bios" || $err "sch5545 !extract"
+ cp "$_sch5545ec_fw" "$_dest" || $err "$_dest: !sch5545 copy"
}
vendor_inject()
@@ -265,17 +254,17 @@ vendor_inject()
set +u +e
[ $# -lt 1 ] && $err "No options specified."
- [ "${1}" = "listboards" ] && eval "items config/coreboot || :; exit 0"
+ [ "$1" = "listboards" ] && eval "items config/coreboot || :; exit 0"
- archive="${1}"
+ archive="$1"
while getopts n:r:b:m: option; do
- case "${option}" in
- n) nukemode="${OPTARG}" ;;
- r) rom=${OPTARG} ;;
- b) board=${OPTARG} ;;
- m) modifygbe=true
- new_mac=${OPTARG} ;;
+ case "$option" in
+ n) nukemode="$OPTARG" ;;
+ r) rom="$OPTARG" ;;
+ b) board="$OPTARG" ;;
+ m) modifygbe="true"
+ new_mac="$OPTARG" ;;
*) : ;;
esac
done
@@ -283,7 +272,7 @@ vendor_inject()
check_board
build_dependencies_inject
inject_vendorfiles
- [ "${nukemode}" = "nuke" ] && return 0
+ [ "$nukemode" = "nuke" ] && return 0
printf "Friendly reminder (this is *not* an error message):\n"
printf "Please ensure that the files were inserted correctly.\n"
}
@@ -291,17 +280,17 @@ vendor_inject()
check_board()
{
failcheck="n"
- check_release "${archive}" || failcheck="y"
- if [ "${failcheck}" = "y" ]; then
+ check_release "$archive" || failcheck="y"
+ if [ "$failcheck" = "y" ]; then
[ -f "$rom" ] || $err "check_board \"$rom\": invalid path"
[ -z "${rom+x}" ] && $err "check_board: no rom specified"
- [ -n "${board+x}" ] || board=$(detect_board "${rom}")
+ [ -n "${board+x}" ] || board="$(detect_board "$rom")"
else
release="y"
- board=$(detect_board "${archive}")
+ board="$(detect_board "$archive")"
fi
- boarddir="${cbcfgsdir}/${board}"
+ boarddir="$cbcfgsdir/$board"
[ -d "$boarddir" ] || $err "check_board: board $board missing"
[ -f "$boarddir/target.cfg" ] || \
$err "check_board $board: target.cfg missing"
@@ -311,29 +300,29 @@ check_board()
check_release()
{
- [ -f "${archive}" ] || return 1
+ [ -f "$archive" ] || return 1
[ "${archive##*.}" = "xz" ] || return 1
- printf "%s\n" "Release archive ${archive} detected"
+ printf "%s\n" "Release archive $archive detected"
}
# This function tries to determine the board from the filename of the rom.
# It will only succeed if the filename is not changed from the build/download
detect_board()
{
- path="${1}"
- filename=$(basename "${path}")
- case ${filename} in
+ path="$1"
+ filename="$(basename "$path")"
+ case "$filename" in
grub_*)
- board=$(echo "${filename}" | cut -d '_' -f2-3) ;;
+ board="$(echo "$filename" | cut -d '_' -f2-3)" ;;
seabios_withgrub_*)
- board=$(echo "${filename}" | cut -d '_' -f3-4) ;;
+ board="$(echo "$filename" | cut -d '_' -f3-4)" ;;
*.tar.xz)
- _stripped_prefix=${filename#*_}
+ _stripped_prefix="${filename#*_}"
board="${_stripped_prefix%.tar.xz}" ;;
*)
$err "detect_board $filename: could not detect board type"
esac
- printf "%s\n" "${board}"
+ printf "%s\n" "$board"
}
build_dependencies_inject()
@@ -341,8 +330,8 @@ build_dependencies_inject()
cbdir="src/coreboot/$tree"
cbfstool="cbutils/$tree/cbfstool"
ifdtool="cbutils/$tree/ifdtool"
- [ -d "${cbdir}" ] || x_ ./update trees -f coreboot $tree
- if [ ! -f "${cbfstool}" ] || [ ! -f "${ifdtool}" ]; then
+ [ -d "$cbdir" ] || x_ ./update trees -f coreboot $tree
+ if [ ! -f "$cbfstool" ] || [ ! -f "$ifdtool" ]; then
x_ ./update trees -b coreboot utils $tree
fi
[ -z "$new_mac" ] || [ -f "$nvmutil" ] || x_ make -C util/nvmutil
@@ -351,111 +340,109 @@ build_dependencies_inject()
inject_vendorfiles()
{
- [ "${release}" != "y" ] && eval "patch_rom \"$rom\"; return 0"
+ [ "$release" != "y" ] && eval "patch_rom \"$rom\"; return 0"
patch_release_roms
}
patch_release_roms()
{
_tmpdir="tmp/romdir"
- remkdir "${_tmpdir}"
- tar -xf "${archive}" -C "${_tmpdir}" || \
+ remkdir "$_tmpdir"
+ tar -xf "$archive" -C "$_tmpdir" || \
$err "patch_release_roms: !tar -xf \"$archive\" -C \"$_tmpdir\""
- for x in "${_tmpdir}"/bin/*/*.rom ; do
+ for x in "$_tmpdir"/bin/*/*.rom ; do
printf "patching rom: %s\n" "$x"
- patch_rom "${x}"
+ patch_rom "$x"
done
(
- cd "${_tmpdir}/bin/"* || \
- $err "patch_release_roms: !cd ${_tmpdir}/bin/*"
+ cd "$_tmpdir/bin/"* || \
+ $err "patch_release_roms: !cd $_tmpdir/bin/*"
# NOTE: For compatibility with older rom releases, defer to sha1
- [ "${nukemode}" = "nuke" ] || sha512sum --status -c vendorhashes || \
+ [ "$nukemode" = "nuke" ] || sha512sum --status -c vendorhashes || \
sha1sum --status -c vendorhashes || sha512sum --status -c \
blobhashes || sha1sum --status -c blobhashes || \
$err "patch_release_roms: ROMs did not match expected hashes"
) || $err "can't verify vendor hashes"
- [ "${modifygbe}" = "true" ] && \
- for x in "${_tmpdir}"/bin/*/*.rom ; do
- modify_gbe "${x}"
+ [ "$modifygbe" = "true" ] && \
+ for x in "$_tmpdir"/bin/*/*.rom ; do
+ modify_gbe "$x"
done
- [ -d bin/release ] || x_ mkdir -p bin/release
- x_ mv "${_tmpdir}"/bin/* bin/release/
- x_ rm -Rf "${_tmpdir}"
+ [ -d "bin/release" ] || x_ mkdir -p bin/release
+ x_ mv "$_tmpdir"/bin/* bin/release/
+ x_ rm -Rf "$_tmpdir"
printf "Success! Your ROMs are in bin/release\n"
}
patch_rom()
{
- rom="${1}"
-
- . "$(check_defconfig "${boarddir}")" 2>/dev/null || exit 0
-
- [ "$CONFIG_HAVE_MRC" = "y" ] && \
- inject "mrc.bin" "${CONFIG_MRC_FILE}" "mrc" "0xfffa0000"
- [ -n "$CONFIG_HAVE_REFCODE_BLOB" ] && \
- inject "fallback/refcode" "$CONFIG_REFCODE_BLOB_FILE" "stage"
- [ "${CONFIG_HAVE_ME_BIN}" = "y" ] && \
- inject "IFD" "${CONFIG_ME_BIN_PATH}" "me"
- [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ] && \
- inject "ecfw1.bin" "$CONFIG_KBC1126_FW1" "raw" \
- "${CONFIG_KBC1126_FW1_OFFSET}" && \
+ rom="$1"
+
+ . "$(check_defconfig "$boarddir")" 2>/dev/null || exit 0
+
+ [ "$CONFIG_HAVE_MRC" = "y" ] && inject "mrc.bin" "$CONFIG_MRC_FILE" \
+ "mrc" "0xfffa0000"
+ [ -n "$CONFIG_HAVE_REFCODE_BLOB" ] && inject "fallback/refcode" \
+ "$CONFIG_REFCODE_BLOB_FILE" "stage"
+ [ "$CONFIG_HAVE_ME_BIN" = "y" ] && inject "IFD" "$CONFIG_ME_BIN_PATH" \
+ "me"
+ [ "$CONFIG_KBC1126_FIRMWARE" = "y" ] && inject "ecfw1.bin" \
+ "$CONFIG_KBC1126_FW1" "raw" "$CONFIG_KBC1126_FW1_OFFSET" && \
inject "ecfw2.bin" "$CONFIG_KBC1126_FW2" "raw" \
- "${CONFIG_KBC1126_FW2_OFFSET}"
+ "$CONFIG_KBC1126_FW2_OFFSET"
[ -n "$CONFIG_VGA_BIOS_FILE" ] && [ -n "$CONFIG_VGA_BIOS_ID" ] && \
- inject "pci${CONFIG_VGA_BIOS_ID}.rom" \
- "${CONFIG_VGA_BIOS_FILE}" "optionrom"
- [ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" = "y" ] && \
- [ -n "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" ] && \
+ inject "pci$CONFIG_VGA_BIOS_ID.rom" \
+ "$CONFIG_VGA_BIOS_FILE" "optionrom"
+ [ "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" = "y" ] && \
+ [ -n "$CONFIG_SMSC_SCH5545_EC_FW_FILE" ] && \
inject "sch5545_ecfw.bin" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw
- [ "${modifygbe}" = "true" ] && ! [ "${release}" = "y" ] && \
- inject "IFD" "${CONFIG_GBE_BIN_PATH}" "GbE"
+ [ "$modifygbe" = "true" ] && ! [ "$release" = "y" ] && \
+ inject "IFD" "$CONFIG_GBE_BIN_PATH" "GbE"
- printf "ROM image successfully patched: %s\n" "${rom}"
+ printf "ROM image successfully patched: %s\n" "$rom"
}
inject()
{
- [ $# -lt 3 ] && \
- $err "inject $@, $rom: usage: inject name path type (offset)"
+ [ $# -lt 3 ] && $err "$@, $rom: usage: inject name path type (offset)"
eval "$(setvars "" cbfsname _dest _t _offset)"
- cbfsname="${1}"
+ cbfsname="$1"
_dest="${2##*../}"
- _t="${3}"
- [ $# -gt 3 ] && _offset="-b ${4}" && [ -z "${4}" ] && \
+ _t="$3"
+ [ $# -gt 3 ] && _offset="-b $4" && [ -z "$4" ] && \
$err "inject $@, $rom: offset passed, but empty (not defined)"
- [ -z "${_dest}" ] && $err "inject $@, ${rom}: empty destination path"
- [ ! -f "${_dest}" ] && [ "${nukemode}" != "nuke" ] && \
- $err "inject_${dl_type}: file missing, ${_dest}"
+ [ -z "$_dest" ] && $err "inject $@, $rom: empty destination path"
+ [ ! -f "$_dest" ] && [ "$nukemode" != "nuke" ] && \
+ $err "inject_$dl_type: file missing, $_dest"
[ "$nukemode" = "nuke" ] || \
- printf "Inserting %s/%s in file: %s\n" "$cbfsname" "$_t" "$rom"
+ printf "Inserting %s/%s into: %s\n" "$cbfsname" "$_t" "$rom"
- if [ "${_t}" = "GbE" ]; then
+ if [ "$_t" = "GbE" ]; then
x_ mkdir -p tmp
- cp "${_dest}" "tmp/gbe.bin" || \
- $err "inject: !cp \"${_dest}\" \"tmp/gbe.bin\""
+ cp "$_dest" "tmp/gbe.bin" || \
+ $err "inject: !cp \"$_dest\" \"tmp/gbe.bin\""
_dest="tmp/gbe.bin"
- "${nvmutil}" "${_dest}" setmac "${new_mac}" || \
- $err "inject ${_dest}: can't change mac address"
+ "$nvmutil" "$_dest" setmac "$new_mac" || \
+ $err "inject $_dest: can't change mac address"
fi
- if [ "${cbfsname}" = "IFD" ]; then
- if [ "${nukemode}" != "nuke" ]; then
- "$ifdtool" -i ${_t}:${_dest} "$rom" -O "$rom" || \
+ if [ "$cbfsname" = "IFD" ]; then
+ if [ "$nukemode" != "nuke" ]; then
+ "$ifdtool" -i $_t:$_dest "$rom" -O "$rom" || \
$err "inject: can't insert $_t ($dest) into $rom"
else
"$ifdtool" --nuke $_t "$rom" -O "$rom" || \
$err "inject $rom: can't nuke $_t in IFD"
fi
else
- if [ "${nukemode}" != "nuke" ]; then
+ if [ "$nukemode" != "nuke" ]; then
if [ "$_t" = "stage" ]; then # broadwell refcode
"$cbfstool" "$rom" add-stage -f "$_dest" \
-n "$cbfsname" -t stage -c lzma