mk: tidy up xbmk_sanitize_version

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-09-16 11:21:56 +01:00
parent cebae0ed80
commit 2dc01a93b9
2 changed files with 6 additions and 9 deletions
+3 -7
View File
@@ -44,13 +44,9 @@ version()
xbmk_sanitize_version() xbmk_sanitize_version()
{ {
[ -z "$version" ] && \ [ -n "$version" ] && version="`printf '%s\n' "$version" | sed \
return 0 's/[[:space:]]//g; s/\.\.//g; s/\.\///g; s/\//-/g; s/^-//'`" \
&& [ -z "$version" ] && \
version="`printf '%s\n' "$version" | sed \
's/[[:space:]]//g; s/\.\.//g; s/\.\///g; s/\//-/g; s/^-//'`"
[ -z "$version" ] && \
err "'version' empty after sanitization" \ err "'version' empty after sanitization" \
"xbmk_sanitize_version" "$@"; : "xbmk_sanitize_version" "$@"; :
} }
+3 -2
View File
@@ -216,7 +216,6 @@ multi_tree_build()
target="${x##*/}" target="${x##*/}"
x_ handle_defconfig x_ handle_defconfig
$if_build \ $if_build \
x_ $postmake; : x_ $postmake; :
done; : done; :
@@ -337,8 +336,10 @@ build_dependencies()
$if_not_dry_build \ $if_not_dry_build \
err "$project/$tree: !bd '$bd'" \ err "$project/$tree: !bd '$bd'" \
"build_dependencies" "$@" "build_dependencies" "$@"
[ "${bd##*/}" = "$bd" ] && \ [ "${bd##*/}" = "$bd" ] && \
bd_tree="" bd_tree=""
[ -n "$bd_project" ] && \ [ -n "$bd_project" ] && \
$if_not_dry_build \ $if_not_dry_build \
x_ "$mk" -b $bd_project $bd_tree; : x_ "$mk" -b $bd_project $bd_tree; :
@@ -525,7 +526,7 @@ check_autoconf()
[ -f "configure" ] && \ [ -f "configure" ] && \
x_ ./configure $configureargs; : x_ ./configure $configureargs; :
) || err "can't bootstrap project: $1" "check_autoconf" "$@"; : ) || err "can't bootstrap project: $1" check_autoconf "$@"; :
} }
check_makefile() check_makefile()