summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-30 14:08:22 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-30 14:08:22 +0100
commit030f1afd8ee79fd9bdb02c041050a80f2f14a632 (patch)
treed0234f372efd3130cc157ae53ea0773d04d57f05
parent73949606195c0e795760c5bf741e1621f3a01e68 (diff)
trees: rename variable "config" to defconfig
Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xscript/trees16
1 files changed, 8 insertions, 8 deletions
diff --git a/script/trees b/script/trees
index 541b802e..79a5898c 100755
--- a/script/trees
+++ b/script/trees
@@ -10,9 +10,9 @@ set -u -e
. "include/git.sh"
cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
-eval `setvars "" xarch cdir config cmakedir xlang mode makeargs elfdir xtree \
- project target target_dir targets tree _f target1 bootstrapargs mkhelper \
- autoconfargs config_name listfile autogenargs btype cmd`
+eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \
+ project target target_dir targets xtree _f target1 bootstrapargs mkhelper \
+ autoconfargs config_name listfile autogenargs btype tree`
main()
{
@@ -108,8 +108,8 @@ handle_defconfig()
for y in "$target_dir/config"/*; do
[ -f "$y" ] || continue
- config="$y"
- config_name="${config#"$target_dir/config/"}"
+ defconfig="$y"
+ config_name="${defconfig#"$target_dir/config/"}"
[ -n "$mode" ] || check_config || continue
handle_makefile
@@ -205,7 +205,7 @@ check_coreboot_utils()
check_config()
{
- [ -f "$config" ] || $err "check_config $project/$target: no config"
+ [ -f "$defconfig" ] || $err "check_config $project/$target: no config"
dest_dir="$elfdir/$target/$config_name"
elfcheck || return 1 # skip build if a previous one exists
@@ -224,14 +224,14 @@ elfcheck()
handle_makefile()
{
check_makefile "$cdir" && x_ make clean -C "$cdir"
- x_ cp "$config" "$cdir/.config"
+ x_ cp "$defconfig" "$cdir/.config"
[ -n "$mode" ] || [ -n "$btype" ] || make -C "$cdir" \
silentoldconfig || make -C "$cdir" oldconfig || :
run_make_command || $err "handle_makefile $cdir: no makefile!"
_copy=".config" && [ "$mode" = "savedefconfig" ] && _copy="defconfig"
- [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$config"
+ [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$defconfig"
[ -e "$cdir/.git" ] && [ "$project" = "u-boot" ] && \
[ "$mode" = "distclean" ] && x_ git -C "$cdir" clean -fdx; return 0