mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-09-19 21:20:31 +02:00
mk: tidy up xbmk_sanitize_version
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+3
-7
@@ -44,13 +44,9 @@ version()
|
||||
|
||||
xbmk_sanitize_version()
|
||||
{
|
||||
[ -z "$version" ] && \
|
||||
return 0
|
||||
|
||||
version="`printf '%s\n' "$version" | sed \
|
||||
's/[[:space:]]//g; s/\.\.//g; s/\.\///g; s/\//-/g; s/^-//'`"
|
||||
|
||||
[ -z "$version" ] && \
|
||||
[ -n "$version" ] && version="`printf '%s\n' "$version" | sed \
|
||||
's/[[:space:]]//g; s/\.\.//g; s/\.\///g; s/\//-/g; s/^-//'`" \
|
||||
&& [ -z "$version" ] && \
|
||||
err "'version' empty after sanitization" \
|
||||
"xbmk_sanitize_version" "$@"; :
|
||||
}
|
||||
|
||||
@@ -216,7 +216,6 @@ multi_tree_build()
|
||||
target="${x##*/}"
|
||||
|
||||
x_ handle_defconfig
|
||||
|
||||
$if_build \
|
||||
x_ $postmake; :
|
||||
done; :
|
||||
@@ -337,8 +336,10 @@ build_dependencies()
|
||||
$if_not_dry_build \
|
||||
err "$project/$tree: !bd '$bd'" \
|
||||
"build_dependencies" "$@"
|
||||
|
||||
[ "${bd##*/}" = "$bd" ] && \
|
||||
bd_tree=""
|
||||
|
||||
[ -n "$bd_project" ] && \
|
||||
$if_not_dry_build \
|
||||
x_ "$mk" -b $bd_project $bd_tree; :
|
||||
@@ -525,7 +526,7 @@ check_autoconf()
|
||||
[ -f "configure" ] && \
|
||||
x_ ./configure $configureargs; :
|
||||
|
||||
) || err "can't bootstrap project: $1" "check_autoconf" "$@"; :
|
||||
) || err "can't bootstrap project: $1" check_autoconf "$@"; :
|
||||
}
|
||||
|
||||
check_makefile()
|
||||
|
||||
Reference in New Issue
Block a user