From 58d73dad946d7b0d1c787d0372b1ebbd6cad88e1 Mon Sep 17 00:00:00 2001
From: Andrew Lee <andrew.lee@netapp.com>
Date: Thu, 2 Nov 2023 11:59:14 +0100
Subject: [PATCH] Move scripts into bin/.

---
 build => bin/build                 | 0
 build_archdep => bin/build_archdep | 0
 build_indep => bin/build_indep     | 0
 build_source => bin/build_source   | 0
 build.containerfile                | 4 ++--
 crossbuild.containerfile           | 4 ++--
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename build => bin/build (100%)
 rename build_archdep => bin/build_archdep (100%)
 rename build_indep => bin/build_indep (100%)
 rename build_source => bin/build_source (100%)

diff --git a/build b/bin/build
similarity index 100%
rename from build
rename to bin/build
diff --git a/build_archdep b/bin/build_archdep
similarity index 100%
rename from build_archdep
rename to bin/build_archdep
diff --git a/build_indep b/bin/build_indep
similarity index 100%
rename from build_indep
rename to bin/build_indep
diff --git a/build_source b/bin/build_source
similarity index 100%
rename from build_source
rename to bin/build_source
diff --git a/build.containerfile b/build.containerfile
index 7c0ab53..4c13d31 100755
--- a/build.containerfile
+++ b/build.containerfile
@@ -36,8 +36,8 @@ RUN apt-get update \
     && ./main \
     && find /tmp -mindepth 1 -delete
 
-# Copy the build scripts to /usr/local/bin
-COPY build_source build_indep build_archdep build /usr/local/bin/
+# Copy the build scripts from bin/ into /usr/local/bin
+COPY bin/ /usr/local/bin
 
 # Copy mini_sudo from stage 1
 COPY --from=mini_sudo /usr/local/bin/sudo /usr/local/bin/sudo
diff --git a/crossbuild.containerfile b/crossbuild.containerfile
index 52bb884..581a571 100644
--- a/crossbuild.containerfile
+++ b/crossbuild.containerfile
@@ -56,8 +56,8 @@ RUN [ "/native/bash", "-c", "PATH=/native:$PATH ./setup_native import $(awk '{ p
 # Clean up /tmp
 RUN find /tmp -mindepth 1 -delete
 
-# Copy the build scripts to /usr/local/bin
-COPY build_source build_indep build_archdep build /usr/local/bin/
+# Copy the build scripts from bin to /usr/local/bin
+COPY bin/ /usr/local/bin
 
 # Copy mini_sudo from stage 1
 COPY --from=mini_sudo /usr/local/bin/sudo /usr/local/bin/sudo