From 6f26bff1bf92cc1347fe7f121da567637e83d297 Mon Sep 17 00:00:00 2001
From: Andrew Lee <andrew.lee@netapp.com>
Date: Mon, 6 Nov 2023 12:08:49 +0100
Subject: [PATCH] Move bin/ into container/ as we installs that will be
 installed into the containers.

---
 README.md                            | 2 +-
 {bin => container/bin}/build         | 0
 {bin => container/bin}/build_archdep | 0
 {bin => container/bin}/build_indep   | 0
 {bin => container/bin}/build_source  | 0
 container/build.containerfile        | 2 +-
 container/crossbuild.containerfile   | 2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename {bin => container/bin}/build (100%)
 rename {bin => container/bin}/build_archdep (100%)
 rename {bin => container/bin}/build_indep (100%)
 rename {bin => container/bin}/build_source (100%)

diff --git a/README.md b/README.md
index b9d64ff..e94bb9c 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
 This project is part of the gardenlinux organization on GitHub and focuses on package building for GardenLinux system.
 
 It contains:
-- `bin/`: This folder contains executable scripts installs into the container.
 - `container/`: This folder contains container-related files that define images and configurations.
   - `*.containerfile`: These files define container images.
+  - `bin/`: This folder contains executable scripts installs into the container.
   - `conf/`: This folder contains containers configurations on installed packages list and native container setup.
 - `conf/`: This folder contains general configuration files.
 - `misc/`: This folder contains miscellaneous files related to the project.
diff --git a/bin/build b/container/bin/build
similarity index 100%
rename from bin/build
rename to container/bin/build
diff --git a/bin/build_archdep b/container/bin/build_archdep
similarity index 100%
rename from bin/build_archdep
rename to container/bin/build_archdep
diff --git a/bin/build_indep b/container/bin/build_indep
similarity index 100%
rename from bin/build_indep
rename to container/bin/build_indep
diff --git a/bin/build_source b/container/bin/build_source
similarity index 100%
rename from bin/build_source
rename to container/bin/build_source
diff --git a/container/build.containerfile b/container/build.containerfile
index 7c3a47a..c8fd6bd 100755
--- a/container/build.containerfile
+++ b/container/build.containerfile
@@ -37,7 +37,7 @@ RUN apt-get update \
     && find /tmp -mindepth 1 -delete
 
 # Copy the build scripts from bin/ into /usr/local/bin
-COPY bin/ /usr/local/bin
+COPY container/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/container/crossbuild.containerfile b/container/crossbuild.containerfile
index 9ccae8e..03de273 100644
--- a/container/crossbuild.containerfile
+++ b/container/crossbuild.containerfile
@@ -57,7 +57,7 @@ RUN [ "/native/bash", "-c", "PATH=/native:$PATH ./setup_native import $(awk '{ p
 RUN find /tmp -mindepth 1 -delete
 
 # Copy the build scripts from bin to /usr/local/bin
-COPY bin/ /usr/local/bin
+COPY container/bin/ /usr/local/bin
 
 # Copy mini_sudo from stage 1
 COPY --from=mini_sudo /usr/local/bin/sudo /usr/local/bin/sudo