From 5899991961b80061369e774b9a519fd7be731057 Mon Sep 17 00:00:00 2001
From: Dor Askayo <dor.askayo@gmail.com>
Date: Thu, 13 Jul 2023 12:39:18 +0300
Subject: [PATCH 1/4] Avoid defining environment variables twice

No change in behavior.
---
 sysc/init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysc/init b/sysc/init
index e0efa26..f434c9c 100755
--- a/sysc/init
+++ b/sysc/init
@@ -68,9 +68,9 @@ ln -s /usr/bin/bash /usr/bin/sh
 cd "${SOURCES}"
 
 cat > .env <<- EOF
-export PATH="${PREFIX}/bin:${PREFIX}/sbin"
-export HOME=/tmp
-export SOURCE_DATE_EPOCH=0
+export PATH=${PATH}
+export HOME=${HOME}
+export SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
 PREFIX=${PREFIX}
 LIBDIR=${LIBDIR}
 SOURCES=${SOURCES}

From 3479d65f58e43a21f195da6e47803b3a052c08b8 Mon Sep 17 00:00:00 2001
From: Dor Askayo <dor.askayo@gmail.com>
Date: Thu, 13 Jul 2023 12:53:02 +0300
Subject: [PATCH 2/4] Remove unnecessary definition of environment variables

These are already made available to run2.sh through the .env file.
---
 sysc/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysc/run.sh b/sysc/run.sh
index 549284d..b15927a 100755
--- a/sysc/run.sh
+++ b/sysc/run.sh
@@ -62,4 +62,4 @@ fi
 
 build bash-5.2.15
 
-exec env -i PATH="${PATH}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash run2.sh
+exec env -i bash run2.sh

From b58c513e8fab2e841f7cf70c8d5371ae3fa31fea Mon Sep 17 00:00:00 2001
From: Dor Askayo <dor.askayo@gmail.com>
Date: Thu, 13 Jul 2023 12:59:29 +0300
Subject: [PATCH 3/4] Define PATH in the sysb .env file

---
 sysb/init | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sysb/init b/sysb/init
index 9925303..e0ca338 100755
--- a/sysb/init
+++ b/sysb/init
@@ -37,7 +37,10 @@ install_tar util-linux-2.19.1 0
 # Begin sysb bootstrapping process
 cd "${SOURCES}"
 
-echo "PREFIX=${PREFIX}" > .env
-echo "SOURCES=${SOURCES}" >> .env
+cat > .env <<- EOF
+export PATH=${PATH}
+PREFIX=${PREFIX}
+SOURCES=${SOURCES}
+EOF
 
 exec ./run.sh

From 3da50962fde239bbd3b1c1a1632fae0adfdc65fa Mon Sep 17 00:00:00 2001
From: Dor Askayo <dor.askayo@gmail.com>
Date: Thu, 13 Jul 2023 13:03:45 +0300
Subject: [PATCH 4/4] Run run.sh with a clean environment

All expected environment variables are passed through the .env file.
Any other variable passed from /init and the environment in which it
is executed only "pollutes" the build environment.

No change in package hashes.
---
 sysb/init | 2 +-
 sysc/init | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysb/init b/sysb/init
index e0ca338..69204d8 100755
--- a/sysb/init
+++ b/sysb/init
@@ -43,4 +43,4 @@ PREFIX=${PREFIX}
 SOURCES=${SOURCES}
 EOF
 
-exec ./run.sh
+exec env -i bash run.sh
diff --git a/sysc/init b/sysc/init
index f434c9c..8a8b99f 100755
--- a/sysc/init
+++ b/sysc/init
@@ -81,4 +81,4 @@ MAKEJOBS=${MAKEJOBS}
 INTERNAL_CI=${INTERNAL_CI}
 EOF
 
-exec ./run.sh
+exec env -i bash run.sh