From fd037722adaa94c508bec70931f1440dc493f92f Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Thu, 27 Jun 2024 22:18:01 +0100
Subject: remove use of _xm variable in the build system
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
build | 19 +++++++++----------
include/git.sh | 5 ++---
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/build b/build
index 080c1e16..b7af9048 100755
--- a/build
+++ b/build
@@ -16,7 +16,7 @@ fi
. "include/vendor.sh"
. "include/mrc.sh"
-eval `setvars "" vdir src_dirname srcdir _xm mode xp`
+eval `setvars "" vdir src_dirname srcdir mode xp`
err="fail"
main()
@@ -90,9 +90,8 @@ mkrelease()
build_release()
{
- _xm="build_release $vdir"
(
- cd "$srcdir" || $err "$_xm: !cd \"$srcdir\""
+ cd "$srcdir" || $err "$vdir: !cd \"$srcdir\""
fetch_trees
x_ mv src/docs docs
) || $err "can't create release files"
@@ -102,18 +101,18 @@ build_release()
rm -f "$srcdir/lock" || $err "can't remove lock file in $srcdir"
(
- cd "${srcdir%/*}" || $err "$_xm: mktarball \"$srcdir\""
- mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || $err "$_xm: mksrc"
+ cd "${srcdir%/*}" || $err "$vdir: mktarball \"$srcdir\""
+ mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || $err "$vdir: mksrc"
) || $err "can't create src tarball"
[ "$mode" = "src" ] && return 0
touch "$srcdir/lock" || $err "can't make lock file in $srcdir/"
(
- cd "$srcdir" || $err "$_xm: 2 !cd \"$srcdir\""
- ./build roms all || $err "$_xm: roms-all"
- ./build roms serprog rp2040 || $err "$_xm: rp2040"
- ./build roms serprog stm32 || $err "$_xm: stm32"
+ cd "$srcdir" || $err "$vdir: 2 !cd \"$srcdir\""
+ ./build roms all || $err "$vdir: roms-all"
+ ./build roms serprog rp2040 || $err "$vdir: rp2040"
+ ./build roms serprog stm32 || $err "$vdir: stm32"
x_ mv bin ../roms
) || $err "can't build rom images"
@@ -123,7 +122,7 @@ build_release()
fetch_trees()
{
for x in $(ls -1 config/git); do
- ./update trees -f "$x" || $err "$_xm: fetch $x"
+ ./update trees -f "$x" || $err "$vdir: fetch $x"
singletree "$x" || x_ rm -Rf "src/$x/$x"
done
rmgit .
diff --git a/include/git.sh b/include/git.sh
index d13d20d2..a73bdc16 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -2,7 +2,7 @@
# Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
-eval `setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree \
+eval `setvars "" _target rev loc url bkup_url depend tree_depend xtree \
mdir subhash subrepo subrepo_bkup subfile subfile_bkup`
fetch_project_trees()
@@ -20,7 +20,6 @@ fetch_config()
eval `setvars "" xtree tree_depend`
while true; do
eval `setvars "" rev tree`
- _xm="fetch_config $project/$_target"
load_target_config "$_target"
[ "$_target" = "$tree" ] && break
_target="$tree"
@@ -31,7 +30,7 @@ fetch_config()
load_target_config()
{
- [ -f "$cfgsdir/$1/seen" ] && $err "$_xm cfg: infinite loop in trees"
+ [ -f "$cfgsdir/$1/seen" ] && $err "$project/$_target: tree loop"
eval `setcfg "$cfgsdir/$1/target.cfg"`
touch "$cfgsdir/$1/seen" || $err "load_config $cfgsdir/$1: !mk seen"
}
--
cgit v1.2.1