summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-09-29 17:23:47 +0100
committerLeah Rowe <leah@libreboot.org>2023-09-29 17:23:47 +0100
commit32da4e319bac527b1ef70f392b5c93d9d4d5ceb4 (patch)
treea2bd664242e0491a94209e630c407354dedfd2e8
parent710171f92b06cfcd7de4d29e29ffa0fe8aee1266 (diff)
merge include/fetch.sh, blobutil.sh, defconfig.sh
They are only ever used by script/update/blobs/*, so put them all in blobutil.sh. This cuts down on the number of scripts in lbmk. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xinclude/blobutil.sh75
-rwxr-xr-xinclude/defconfig.sh11
-rwxr-xr-xinclude/fetch.sh41
-rwxr-xr-xscript/update/blobs/download2
-rwxr-xr-xscript/update/blobs/inject1
5 files changed, 60 insertions, 70 deletions
diff --git a/include/blobutil.sh b/include/blobutil.sh
index b85b8644..405e056d 100755
--- a/include/blobutil.sh
+++ b/include/blobutil.sh
@@ -1,25 +1,12 @@
# SPDX-License-Identifier: GPL-3.0-only
# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
-_7ztest="a"
+agent="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
+_7ztest="a"
_b=""
blobdir="blobs"
appdir="${blobdir}/app"
-
-setvars="EC_url=\"\""
-for x in EC_url_bkup EC_hash DL_hash DL_url DL_url_bkup 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 MRC_url \
- MRC_url_bkup MRC_hash MRC_board; do
- setvars="${setvars}; ${x}=\"\""
-done
-
-for x in sname archive _filetype rom board modifygbe new_mac release \
- releasearchive vendor_rom; do
- setvars="${setvars}; ${x}=\"\""
-done
-
cbdir="coreboot/default"
cbcfgsdir="config/coreboot"
ifdtool="cbutils/default/ifdtool"
@@ -35,6 +22,19 @@ kbc1126_ec_dump="$(pwd)/${cbdir}/util/kbc1126/kbc1126_ec_dump"
pfs_extract="$(pwd)/biosutilities/Dell_PFS_Extract.py"
uefiextract="$(pwd)/uefitool/uefiextract"
+setvars="EC_url=\"\""
+for x in EC_url_bkup EC_hash DL_hash DL_url DL_url_bkup 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 MRC_url \
+ MRC_url_bkup MRC_hash MRC_board; do
+ setvars="${setvars}; ${x}=\"\""
+done
+
+for x in sname archive _filetype rom board modifygbe new_mac release \
+ releasearchive vendor_rom dl_path; do
+ setvars="${setvars}; ${x}=\"\""
+done
+
for x in _me_destination _gbe_destination _ifd_destination \
CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \
@@ -46,3 +46,48 @@ for x in _me_destination _gbe_destination _ifd_destination \
done
eval "${setvars}"
+
+check_defconfig()
+{
+ no_config="printf \"No target defconfig in %s\\n\" ${1} 1>&2; return 1"
+ for x in "${1}"/config/*; do
+ [ -f "${x}" ] && no_config=""
+ done
+ eval "${no_config}"
+}
+
+fetch()
+{
+ dl_type="${1}"
+ dl="${2}"
+ dl_bkup="${3}"
+ dlsum="${4}"
+ dl_path="${5}"
+ _fail="${6}"
+
+ mkdir -p "${dl_path%/*}" || "${_fail}" "fetch: !mkdir ${dl_path%/*}"
+
+ dl_fail="y"
+ vendor_checksum "${dlsum}" "${dl_path}" && dl_fail="n"
+ for url in "${dl}" "${dl_bkup}"; do
+ [ "${dl_fail}" = "n" ] && break
+ [ -z "${url}" ] && continue
+ rm -f "${dl_path}" || "${_fail}" "fetch: !rm -f ${dl_path}"
+ wget --tries 3 -U "${agent}" "${url}" -O "${dl_path}" || \
+ continue
+ vendor_checksum "${dlsum}" "${dl_path}" && dl_fail="n"
+ done
+ [ "${dl_fail}" = "y" ] && \
+ "${_fail}" "fetch ${dlsum}: matched file unavailable"
+
+ eval "extract_${dl_type}"
+}
+
+vendor_checksum()
+{
+ if [ "$(sha512sum ${2} | awk '{print $1}')" != "${1}" ]; then
+ printf "Bad checksum for file: %s\n" "${2}" 1>&2
+ rm -f "${2}" || :
+ return 1
+ fi
+}
diff --git a/include/defconfig.sh b/include/defconfig.sh
deleted file mode 100755
index 7b2e4c12..00000000
--- a/include/defconfig.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
-
-check_defconfig()
-{
- no_config="printf \"No target defconfig in %s\\n\" ${1} 1>&2; return 1"
- for x in "${1}"/config/*; do
- [ -f "${x}" ] && no_config=""
- done
- eval "${no_config}"
-}
diff --git a/include/fetch.sh b/include/fetch.sh
deleted file mode 100755
index 08a1d044..00000000
--- a/include/fetch.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
-
-agent="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
-dl_path=""
-
-fetch()
-{
- dl_type="${1}"
- dl="${2}"
- dl_bkup="${3}"
- dlsum="${4}"
- dl_path="${5}"
- _fail="${6}"
-
- mkdir -p "${dl_path%/*}" || "${_fail}" "fetch: !mkdir ${dl_path%/*}"
-
- dl_fail="y"
- vendor_checksum "${dlsum}" "${dl_path}" && dl_fail="n"
- for url in "${dl}" "${dl_bkup}"; do
- [ "${dl_fail}" = "n" ] && break
- [ -z "${url}" ] && continue
- rm -f "${dl_path}" || "${_fail}" "fetch: !rm -f ${dl_path}"
- wget --tries 3 -U "${agent}" "${url}" -O "${dl_path}" || \
- continue
- vendor_checksum "${dlsum}" "${dl_path}" && dl_fail="n"
- done
- [ "${dl_fail}" = "y" ] && \
- "${_fail}" "fetch ${dlsum}: matched file unavailable"
-
- eval "extract_${dl_type}"
-}
-
-vendor_checksum()
-{
- if [ "$(sha512sum ${2} | awk '{print $1}')" != "${1}" ]; then
- printf "Bad checksum for file: %s\n" "${2}" 1>&2
- rm -f "${2}" || :
- return 1
- fi
-}
diff --git a/script/update/blobs/download b/script/update/blobs/download
index ca8302d2..09251419 100755
--- a/script/update/blobs/download
+++ b/script/update/blobs/download
@@ -5,9 +5,7 @@
# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
. "include/err.sh"
-. "include/defconfig.sh"
. "include/blobutil.sh"
-. "include/fetch.sh"
. "include/mrc.sh"
export PATH="${PATH}:/sbin"
diff --git a/script/update/blobs/inject b/script/update/blobs/inject
index d4a8d1aa..a36815a4 100755
--- a/script/update/blobs/inject
+++ b/script/update/blobs/inject
@@ -5,7 +5,6 @@
# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
. "include/err.sh"
-. "include/defconfig.sh"
. "include/blobutil.sh"
. "include/option.sh"