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.
This commit is contained in:
parent
fde1bbc571
commit
fcea28eb38
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue