coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 05:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove use of _xm variable in the build system

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2024-06-27 22:18:01 +01:00
parent 136787185d
commit fd037722ad
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build
+9 -10
View File
@@ -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 .