andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Dor Askayo 2022-05-15 11:49:50 +03:00
parent fde1bbc571
commit fcea28eb38
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysa/run.sh
View File

@ -72,7 +72,7 @@ if [ -z "${CHROOT}" ]; then
ask_chroot ask_chroot
echo echo
echo "export CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg" echo "CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg"
fi fi
ask_timestamps() { ask_timestamps() {
@ -94,12 +94,12 @@ if [ -z "${FORCE_TIMESTAMPS}" ]; then
ask_timestamps ask_timestamps
echo echo
echo "export FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg" echo "FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg"
fi fi
echo "Thank you! All done." echo "Thank you! All done."
echo "export ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg" echo "ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg"
mkdir -p "${DESTDIR}" "${REPO}" /dev mkdir -p "${DESTDIR}" "${REPO}" /dev

2
sysb/run.sh
View File

@ -54,7 +54,7 @@ if [ -z "${DISK}" ] || ! [ -e "/dev/${DISK}" ]; then
echo "You did not provide a valid disk in the configuration file." echo "You did not provide a valid disk in the configuration file."
ask_disk ask_disk
echo "export DISK=${DISK}" >> /usr/src/bootstrap.cfg echo "DISK=${DISK}" >> /usr/src/bootstrap.cfg
fi fi
PREFIX=/usr PREFIX=/usr