diff options
Diffstat (limited to 'resources/scripts/blobs')
-rwxr-xr-x | resources/scripts/blobs/download | 22 | ||||
-rwxr-xr-x | resources/scripts/blobs/extract | 2 | ||||
-rwxr-xr-x | resources/scripts/blobs/inject | 7 |
3 files changed, 16 insertions, 15 deletions
diff --git a/resources/scripts/blobs/download b/resources/scripts/blobs/download index f1898899..3c185477 100755 --- a/resources/scripts/blobs/download +++ b/resources/scripts/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-License-Identifier: GPL-3.0-only board="${1}" @@ -16,10 +17,10 @@ Download_needed(){ for need in ${needs}; do case ${need} in *ME*) - Extract_me || _failed+=" me" + Extract_me || _failed="${_failed} me" ;; *MRC*) - ./download mrc || _failed+=" mrc" + ./download mrc || _failed="${_failed} mrc" ;; esac done @@ -96,23 +97,23 @@ set -- "resources/coreboot/${board}/config/*" if [ "${CONFIG_HAVE_MRC}" = "y" ]; then printf 'haswell board detected, downloading mrc\n' - needs+=" MRC" + needs="${needs} MRC" fi if [ "${CONFIG_HAVE_IFD_BIN}" = "y" ]; then printf 'board needs intel firmware descriptor\n' - needs+=" IFD" + needs="${needs} IFD" fi if [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then printf 'board needs intel management engine\n' - needs+=" ME" + needs="${needs} ME" fi if [ "${CONFIG_HAVE_GBE_BIN}" = "y" ]; then printf 'board needs gigabit ethernet firmware\n' - needs+=" GBE" + needs="${needs} GBE" fi # Quickly exit without wasting more time if there are no blobs needed (GM45) @@ -138,8 +139,7 @@ while read -r line ; do me_dl_bkup=${2} ;; esac -done <<< $(eval "awk ' /\{.*${board_short}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }' resources/blobs/sources") - +done << EOF +$(eval "awk ' /\{.*${board_short}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }' resources/blobs/sources") +EOF Download_needed - - diff --git a/resources/scripts/blobs/extract b/resources/scripts/blobs/extract index b88741a7..9080207e 100755 --- a/resources/scripts/blobs/extract +++ b/resources/scripts/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/blobs/inject b/resources/scripts/blobs/inject index 92fdd628..d74b147a 100755 --- a/resources/scripts/blobs/inject +++ b/resources/scripts/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-License-Identifier: GPL-3.0-only Fail(){ @@ -53,10 +54,10 @@ Detect_board(){ filename=$(basename ${rom}) 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) ;; *) return 1 |