summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-05-18 19:44:44 +0100
committerLeah Rowe <leah@libreboot.org>2024-05-18 19:45:52 +0100
commit8418ea9ab2dbcf13ebbfa23cd620a1bf108a24f3 (patch)
tree90097d5c3050bb77b9d18572900296db9e6880d9 /include
parent53b394f583cb0e2afce22cd759d4100a9a8a588f (diff)
vendor.sh: greatly simplified config handling
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rwxr-xr-xinclude/option.sh2
-rwxr-xr-xinclude/vendor.sh5
2 files changed, 2 insertions, 5 deletions
diff --git a/include/option.sh b/include/option.sh
index 1114611b..3d9f4536 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -122,7 +122,7 @@ EOF
check_defconfig()
{
for x in "${1}"/config/*; do
- [ -f "${x}" ] && return 1
+ [ -f "${x}" ] && printf "%s\n" "$x" && return 1
done
}
diff --git a/include/vendor.sh b/include/vendor.sh
index eb250a6f..06b10fc7 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -46,10 +46,7 @@ vendor_download()
detect_firmware()
{
[ -d "$boarddir" ] || $err "Target '$board' not defined."
- check_defconfig "${boarddir}" && exit 0
-
- set -- "${boarddir}/config/"*
- . "${1}" 2>/dev/null
+ . "$(check_defconfig "${boarddir}")" 2>/dev/null || exit 0
. "${boarddir}/target.cfg" 2>/dev/null
[ -z "$tree" ] && $err "detect_firmware $boarddir: tree undefined"