ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-20 21:43:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blobs/*: Fix extract script (#792)

Browse Source 
Command returns a list of utilities found. This can happen if multiple
coreboot folders are present.

Use only one to fix a crash in the following lines.

Test: Being able to extract blobs when two coreboot folders are present,
      both containing an IFDTOOL.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
This commit is contained in:
Patrick Rudolph 2020-09-04 20:01:47 +02:00 committed by GitHub
parent b2c49e8742
commit 843d4adb4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blobs/t420/extract.sh
View File

@ -28,7 +28,7 @@ while getopts ":f:m:i:" opt; do
done done
if [ -z "$MECLEAN" ]; then if [ -z "$MECLEAN" ]; then
MECLEAN=`command -v $BLOBDIR/../../build/coreboot-*/util/me_cleaner/me_cleaner.py 2>&1` MECLEAN=`command -v $BLOBDIR/../../build/coreboot-*/util/me_cleaner/me_cleaner.py 2>&1|head -n1`
if [ -z "$MECLEAN" ]; then if [ -z "$MECLEAN" ]; then
echo "me_cleaner.py required but not found or specified with -m. Aborting." echo "me_cleaner.py required but not found or specified with -m. Aborting."
exit 1; exit 1;
@ -36,7 +36,7 @@ if [ -z "$MECLEAN" ]; then
fi fi
if [ -z "$IFDTOOL" ]; then if [ -z "$IFDTOOL" ]; then
IFDTOOL=`command -v $BLOBDIR/../../build/coreboot-*/util/ifdtool/ifdtool 2>&1` IFDTOOL=`command -v $BLOBDIR/../../build/coreboot-*/util/ifdtool/ifdtool 2>&1|head -n1`
if [ -z "$IFDTOOL" ]; then if [ -z "$IFDTOOL" ]; then
echo "ifdtool required but not found or specified with -m. Aborting." echo "ifdtool required but not found or specified with -m. Aborting."
exit 1; exit 1;

4
blobs/x220/extract.sh
View File

@ -28,7 +28,7 @@ while getopts ":f:m:i:" opt; do
done done
if [ -z "$MECLEAN" ]; then if [ -z "$MECLEAN" ]; then
MECLEAN=`command -v $BLOBDIR/../../build/coreboot-*/util/me_cleaner/me_cleaner.py 2>&1` MECLEAN=`command -v $BLOBDIR/../../build/coreboot-*/util/me_cleaner/me_cleaner.py 2>&1|head -n1`
if [ -z "$MECLEAN" ]; then if [ -z "$MECLEAN" ]; then
echo "me_cleaner.py required but not found or specified with -m. Aborting." echo "me_cleaner.py required but not found or specified with -m. Aborting."
exit 1; exit 1;
@ -36,7 +36,7 @@ if [ -z "$MECLEAN" ]; then
fi fi
if [ -z "$IFDTOOL" ]; then if [ -z "$IFDTOOL" ]; then
IFDTOOL=`command -v $BLOBDIR/../../build/coreboot-*/util/ifdtool/ifdtool 2>&1` IFDTOOL=`command -v $BLOBDIR/../../build/coreboot-*/util/ifdtool/ifdtool 2>&1|head -n1`
if [ -z "$IFDTOOL" ]; then if [ -z "$IFDTOOL" ]; then
echo "ifdtool required but not found or specified with -m. Aborting." echo "ifdtool required but not found or specified with -m. Aborting."
exit 1; exit 1;