From d6488676ceeeac92a168113be0ba08cd1a9aa63c Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sat, 9 Jul 2022 22:33:30 -0500
Subject: [PATCH] Rename $MYBUILD to $TEMP (it's not exported so shouldn't
 conflict).

---
 scripts/mkroot.sh     | 8 ++++----
 scripts/root/plumbing | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/mkroot.sh b/scripts/mkroot.sh
index 6eaee34e..06c979c9 100755
--- a/scripts/mkroot.sh
+++ b/scripts/mkroot.sh
@@ -66,8 +66,8 @@ if [ -z "$NOAIRLOCK"] && [ -n "$CROSS_COMPILE" ]; then
 fi
 
 # Create per-target work directories
-MYBUILD="$BUILD/${CROSS}-tmp" && rm -rf "$MYBUILD" &&
-mkdir -p "$MYBUILD" "$OUTPUT" "$LOG" || exit 1
+TEMP="$BUILD/${CROSS}-tmp" && rm -rf "$TEMP" &&
+mkdir -p "$TEMP" "$OUTPUT" "$LOG" || exit 1
 [ -z "$ROOT" ] && ROOT="$OUTPUT/fs" && rm -rf "$ROOT"
 
 # ----- log build output
@@ -253,7 +253,7 @@ else
 
   announce "linux-$KARCH"
   pushd "$LINUX" && make distclean && popd &&
-  cp -sfR "$LINUX" "$MYBUILD/linux" && pushd "$MYBUILD/linux" &&
+  cp -sfR "$LINUX" "$TEMP/linux" && pushd "$TEMP/linux" &&
   # Fix x86-64 and sh2eb
   sed -Eis '/select HAVE_(STACK_VALIDATION|OBJTOOL)/d' arch/x86/Kconfig &&
   sed -is 's/depends on !SMP/& || !MMU/' mm/Kconfig &&
@@ -296,4 +296,4 @@ if [ -z "$BUILTIN" ]; then
 fi
 
 mv "$LOG/$CROSS".{n,y}
-rmdir "$MYBUILD" "$BUILD" 2>/dev/null || exit 0 # remove if empty, not an error
+rmdir "$TEMP" "$BUILD" 2>/dev/null || exit 0 # remove if empty, not an error
diff --git a/scripts/root/plumbing b/scripts/root/plumbing
index 5b849828..e72247c0 100755
--- a/scripts/root/plumbing
+++ b/scripts/root/plumbing
@@ -24,10 +24,10 @@ download() {
 
 # Usage: setupfor PACKAGE
 # Extracts source tarball (or snapshot a repo) to create disposable build dir.
-# Basically "tar xvzCf $MYBUILD $DOWNLOAD/$1.tar.gz && cd $NEWDIR"
+# Basically "tar -xvz -C $TEMP -f $DOWNLOAD/$1.tar.gz && cd $NEWDIR"
 setupfor() {
   PACKAGE="$(basename "$1")"
-  announce "$PACKAGE" && cd "$MYBUILD" && rm -rf "$PACKAGE" || exit 1
+  announce "$PACKAGE" && cd "$TEMP" && rm -rf "$PACKAGE" || exit 1
   if [ -d "$DOWNLOAD/$PACKAGE" ]; then
     cp -la "$DOWNLOAD/$PACKAGE/." "$PACKAGE" && cd "$PACKAGE" || exit 1
   else
-- 
2.39.2