commit: fcea28eb38adfcf2117d9b8bc9b9adb608799208
parent fde1bbc5713a5edcb5974926441f6bdf559e0a20
Author: Dor Askayo <dor.askayo@gmail.com>
Date: Sun, 15 May 2022 11:49:50 +0300
Don't export variables from bootstrap.cfg
These variables should only affect live-bootstrap's scripts, yet they
currently "pollute" the build environment of most packages during the
bootstrap unnecessarily.
This change also makes bootstrap.cfg keep the same format between the
different bootstrap stages, which simplifies the input to each step.
Diffstat:
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sysa/run.sh b/sysa/run.sh
@@ -72,7 +72,7 @@ if [ -z "${CHROOT}" ]; then
ask_chroot
echo
- echo "export CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg"
+ echo "CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg"
fi
ask_timestamps() {
@@ -94,12 +94,12 @@ if [ -z "${FORCE_TIMESTAMPS}" ]; then
ask_timestamps
echo
- echo "export FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg"
+ echo "FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg"
fi
echo "Thank you! All done."
-echo "export ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg"
+echo "ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg"
mkdir -p "${DESTDIR}" "${REPO}" /dev
diff --git a/sysb/run.sh b/sysb/run.sh
@@ -54,7 +54,7 @@ if [ -z "${DISK}" ] || ! [ -e "/dev/${DISK}" ]; then
echo "You did not provide a valid disk in the configuration file."
ask_disk
- echo "export DISK=${DISK}" >> /usr/src/bootstrap.cfg
+ echo "DISK=${DISK}" >> /usr/src/bootstrap.cfg
fi
PREFIX=/usr