From 51e424c7d189815ad3931ea07fc1f2b2b48e10c6 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 4 Oct 2025 08:36:18 +0100 Subject: tree.sh: rename btype to buildtype, for clarity Signed-off-by: Leah Rowe --- config/data/grub/mkhelper.cfg | 2 +- config/uefitool/target.cfg | 2 +- include/tree.sh | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg index 8c250f6b..e445900d 100644 --- a/config/data/grub/mkhelper.cfg +++ b/config/data/grub/mkhelper.cfg @@ -3,5 +3,5 @@ bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" autoconfargs="--with-platform=coreboot --disable-werror" makeargs="FS_PAYLOAD_MODULES=\"\"" -btype="autohell" +buildtype="autohell" mkhelper="mkpayload_grub" diff --git a/config/uefitool/target.cfg b/config/uefitool/target.cfg index ce1ff3af..9dfb2543 100644 --- a/config/uefitool/target.cfg +++ b/config/uefitool/target.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later cmakedir="UEFIExtract" -btype="cmake" +buildtype="cmake" diff --git a/include/tree.sh b/include/tree.sh index 46bf5dad..ff775c42 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -27,7 +27,7 @@ mkhelper="" autoconfargs="" listfile="" autogenargs="" -btype="" +buildtype="" rev="" build_depend="" gccdir="" @@ -260,7 +260,7 @@ configure_project() xtree="" postmake="" makeargs="" - btype="" + buildtype="" mkhelper="" bootstrapargs="" premake="" @@ -273,7 +273,7 @@ configure_project() _tcfg="$1/target.cfg" if [ ! -f "$_tcfg" ]; then - btype="auto" + buildtype="auto" fi # globally initialise all variables for a source tree / target: @@ -333,7 +333,7 @@ configure_project() if [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ]; then return 1 fi - if [ -n "$btype" ] && [ "${mode%config}" != "$mode" ]; then + if [ -n "$buildtype" ] && [ "${mode%config}" != "$mode" ]; then return 1 fi -- cgit v1.2.1