summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-07-26 15:24:00 +0100
committerLeah Rowe <leah@libreboot.org>2024-07-26 15:49:49 +0100
commit7fa6052de036f81b54a93bf2f707f563205f176b (patch)
tree009ea8e1c23e59111d9965aa5623583f6702f85b /build
parent3bd290f6a615c0bf9f8e9095b96e9f30bf2d49bf (diff)
general code cleanup in the build system
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'build')
-rwxr-xr-xbuild28
1 files changed, 9 insertions, 19 deletions
diff --git a/build b/build
index 09c908c5..ffed6708 100755
--- a/build
+++ b/build
@@ -27,7 +27,7 @@ main()
for g in "which git" "git config --global user.name" \
"git config --global user.email" "git_init"; do
- eval "$g 1>/dev/null 2>/dev/null || git_err \"$g\""
+ eval "$g 1>/dev/null 2>/dev/null || $err \"Unconfigured: $g\""
done
case "${spath#script/}" in
@@ -37,14 +37,13 @@ main()
download) shift 1; vendor_download $@ ;;
roms)
if [ $# -gt 1 ] && [ "$2" = "serprog" ]; then
- x_ ./update trees -b stm32-vserprog
- x_ ./update trees -b pico-serprog; return 0
+ x_ ./mk -b stm32-vserprog
+ x_ ./mk -b pico-serprog; return 0
fi; shift 1
- x_ ./update trees -b coreboot $@ ;;
+ x_ ./mk -b coreboot $@ ;;
*)
- echo "'$@'"
[ -f "$spath" ] || $err "bad command"
- $shcmd; "$spath" $@ || $err "excmd: $spath $@" ;;
+ $shcmd; "$spath" $@ || $err "excmd: $spath $(echo "$@")" ;;
esac
set -u -e # some commands disable them. turn them on!
}
@@ -62,12 +61,6 @@ git_init()
git tag -a "$version" -m "$projectname $version" || return 1
}
-git_err()
-{
- printf "You need to set git name/email, like so:\n%s\n\n" "$1" 1>&2
- $err "Git name/email not configured"
-}
-
mkrelease()
{
export XBMK_RELEASE="y"
@@ -100,9 +93,7 @@ build_release()
{
(
cd "$srcdir" || $err "$vdir: !cd \"$srcdir\""
- ./update trees -f
- rmgit .
- x_ rm -Rf tmp
+ ./mk -f; x_ rm -Rf tmp; rmgit .
x_ mv src/docs docs
) || $err "can't create release files"
@@ -117,12 +108,11 @@ build_release()
[ "$mode" = "src" ] && return 0
touch "$srcdir/lock" || $err "can't make lock file in $srcdir/"
-
(
cd "$srcdir" || $err "$vdir: 2 !cd \"$srcdir\""
- ./update trees -b coreboot || $err "$vdir: roms-all"
- ./update trees -b pico-serprog || $err "$vdir: rp2040"
- ./update trees -b stm32-vserprog || $err "$vdir: stm32"
+ ./mk -b coreboot || $err "$vdir: roms-all"
+ ./mk -b pico-serprog || $err "$vdir: rp2040"
+ ./mk -b stm32-vserprog || $err "$vdir: stm32"
x_ mv bin ../roms
) || $err "can't build rom images"