diff options
Diffstat (limited to 'resources/scripts/update/blobs')
| -rwxr-xr-x | resources/scripts/update/blobs/download | 27 | ||||
| -rwxr-xr-x | resources/scripts/update/blobs/extract | 2 | ||||
| -rwxr-xr-x | resources/scripts/update/blobs/inject | 7 |
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#*_} |