summaryrefslogtreecommitdiff
path: root/resources/scripts/update/blobs
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-06-13 12:09:01 +0100
committerLeah Rowe <leah@libreboot.org>2023-06-13 12:09:01 +0100
commit2e38ddaa9bb0a8d9e0657cd5b20b796ff02a0abe (patch)
tree39877daa06996bb6eb44d0b3bf7e8c9e0c52427d /resources/scripts/update/blobs
parent81bf2293df0fc93513a5c6ae9f4028a877c6f7d9 (diff)
Revert "Remove most of Ferass's lbmk contributions"
This reverts commit a4ea2867319471d9fe7d4ee540881e0286b4d3cf. The licensing audit has been abandoned. I will not be re-licensing in bulk to MIT. I can still use MIT license on new works, e.g. utilities, but there's really no pressing need to re-license lbmk. It's just shell scripts, and most of what it interacts with (coreboot, grub, seabios) is GPL anyway. So who cares? Ferass's patch was removed due to refusal to re-license, but the decision to re-license has been canceled. I'm now aiming for a quick stable release.
Diffstat (limited to 'resources/scripts/update/blobs')
-rwxr-xr-xresources/scripts/update/blobs/download27
-rwxr-xr-xresources/scripts/update/blobs/extract2
-rwxr-xr-xresources/scripts/update/blobs/inject7
3 files changed, 20 insertions, 16 deletions
diff --git a/resources/scripts/update/blobs/download b/resources/scripts/update/blobs/download
index 57bdfe62..7c775ea5 100755
--- a/resources/scripts/update/blobs/download
+++ b/resources/scripts/update/blobs/download
@@ -1,6 +1,7 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
+# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# SPDX-FileCopyrightText: 2023 Leah Rowe <info@minifree.org>
# SPDX-License-Identifier: GPL-3.0-only
@@ -63,23 +64,23 @@ detect_firmware()
. "${boarddir}/board.cfg"
if [ "${CONFIG_HAVE_MRC}" = "y" ]; then
- needs+=" MRC"
+ needs="${needs} MRC"
fi
if [ "${CONFIG_HAVE_IFD_BIN}" = "y" ]; then
- needs+=" IFD"
+ needs="${needs} IFD"
fi
if [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then
- needs+=" ME"
+ needs="${needs} ME"
fi
if [ "${CONFIG_HAVE_GBE_BIN}" = "y" ]; then
- needs+=" GBE"
+ needs="${needs} GBE"
fi
if [ "${CONFIG_KBC1126_FIRMWARE}" = "y" ]; then
- needs+=" EC"
+ needs="${needs} EC"
fi
if [ "${CONFIG_BOARD_DELL_E6400}" = "y" ] \
&& [ "${CONFIG_VGA_BIOS_FILE}" != "" ]; then
- needs+=" E6400VGA"
+ needs="${needs} E6400VGA"
fi
if [ -z ${needs+x} ]; then
printf 'No binary blobs needed for this board\n'
@@ -142,7 +143,9 @@ scan_sources_config()
e6400_vga_romname=${2}
;;
esac
- done <<< $(eval "awk '${awkstr}' resources/blobs/sources")
+ done << EOF
+ $(eval "awk '${awkstr}' resources/blobs/sources")
+EOF
}
build_dependencies()
@@ -178,16 +181,16 @@ download_blobs()
for need in ${needs}; do
case ${need} in
*ME*)
- download_blob_intel_me || _failed+=" me"
+ download_blob_intel_me || _failed="${_failed} me"
;;
*EC*)
- download_ec || _failed+=" ec"
+ download_ec || _failed="${_failed} ec"
;;
*E6400VGA*)
- download_e6400vga || _failed+=" e6400vga"
+ download_e6400vga || _failed="${_failed} e6400vga"
;;
*MRC*)
- ./download mrc || _failed+=" mrc"
+ ./download mrc || _failed="${_failed} mrc"
;;
esac
done
diff --git a/resources/scripts/update/blobs/extract b/resources/scripts/update/blobs/extract
index 8e9c74ed..b32ec0ea 100755
--- a/resources/scripts/update/blobs/extract
+++ b/resources/scripts/update/blobs/extract
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
# script to automate extracting blobs from an existing vendor bios
# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
diff --git a/resources/scripts/update/blobs/inject b/resources/scripts/update/blobs/inject
index 51f67255..ca8aae4c 100755
--- a/resources/scripts/update/blobs/inject
+++ b/resources/scripts/update/blobs/inject
@@ -1,6 +1,7 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
+# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
# SPDX-FileCopyrightText: 2023 Leah Rowe <info@minifree.org>
# SPDX-License-Identifier: GPL-3.0-only
@@ -111,10 +112,10 @@ detect_board()
filename=$(basename ${path})
case ${filename} in
grub_*)
- board=$(cut -d '_' -f2-3 <<<${filename})
+ board=$(echo "${filename}" | cut -d '_' -f2-3)
;;
seabios_withgrub_*)
- board=$(cut -d '_' -f3-4 <<<${filename})
+ board=$(echo "${filename}" | cut -d '_' -f3-4)
;;
*.tar.xz)
_stripped_prefix=${filename#*_}