From efebfa992b6f64d610115502d47468bc039b3a59 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 2 Dec 2024 21:22:36 +0000
Subject: Revert "trees: Allow using a custom clean command"

This reverts commit 5b4c9158e5a79f8d7e776c8c4ece69dda5aa8690.
---
 config/data/coreboot/mkhelper.cfg |  1 -
 config/data/seabios/mkhelper.cfg  |  1 -
 config/data/u-boot/mkhelper.cfg   |  1 -
 script/trees                      | 10 +++-------
 4 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 config/data/u-boot/mkhelper.cfg

diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 8d892fc4..a218e0e7 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -2,7 +2,6 @@
 
 makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
 build_depend="seabios/default grub/default memtest86plus u-boot/amd64coreboot"
-cleancmd="distclean"
 
 seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
 
diff --git a/config/data/seabios/mkhelper.cfg b/config/data/seabios/mkhelper.cfg
index 86c74456..e69de29b 100644
--- a/config/data/seabios/mkhelper.cfg
+++ b/config/data/seabios/mkhelper.cfg
@@ -1 +0,0 @@
-cleancmd="distclean"
diff --git a/config/data/u-boot/mkhelper.cfg b/config/data/u-boot/mkhelper.cfg
deleted file mode 100644
index 86c74456..00000000
--- a/config/data/u-boot/mkhelper.cfg
+++ /dev/null
@@ -1 +0,0 @@
-cleancmd="distclean"
diff --git a/script/trees b/script/trees
index b40c00db..698d2b34 100755
--- a/script/trees
+++ b/script/trees
@@ -14,8 +14,7 @@ XBMKPATH="$PATH"
 eval `setvars "" xarch srcdir premake cmakedir xlang mode makeargs elfdir cmd \
     project target target_dir targets xtree _f release bootstrapargs mkhelper \
     autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \
-    defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs cleancmd`
-badhash="n"
+    defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs`; badhash="n"
 
 main()
 {
@@ -117,7 +116,7 @@ configure_project()
 {
 	eval `setvars "" xarch xlang build_depend autoconfargs xtree postmake \
 	    tree_depend makeargs btype mkhelper bootstrapargs premake release \
-	    cleanargs cleancmd`
+	    cleanargs`
 	_tcfg="$1/target.cfg"; badhash="n"; [ -f "$_tcfg" ] || btype="auto"
 	[ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"`
 
@@ -232,10 +231,7 @@ elfcheck()
 
 handle_makefile()
 {
-	_cleancmd="clean"
-	[ -n "$cleancmd" ] && _cleancmd="$cleancmd"
-	$dry check_makefile "$srcdir" && \
-	    x_ make -C "$srcdir" $cleanargs $_cleancmd
+	$dry check_makefile "$srcdir" && x_ make -C "$srcdir" $cleanargs clean
 	[ -f "$defconfig" ] && x_ cp "$defconfig" "$srcdir/.config"
 	[ -n "$mode" ] || [ -n "$btype" ] || $dry make -C \
 	    "$srcdir" silentoldconfig || make -C "$srcdir" oldconfig || :
-- 
cgit v1.2.1