moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: open $XBPS_MASTERDIR/etc/xbps/xbps-src.conf only once

Browse source
This commit is contained in:
Duncaen 2019-06-13 00:29:49 +02:00 • committed by Juan RP
parent 6d3c739c9a
commit f1ec7fac9f
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/xbps-src/shutils/chroot.sh
View file

@ -3,17 +3,11 @@
# FIXME: $XBPS_FFLAGS is not set when chroot_init() is run # FIXME: $XBPS_FFLAGS is not set when chroot_init() is run
# It is set in common/build-profiles/bootstrap.sh but lost somewhere? # It is set in common/build-profiles/bootstrap.sh but lost somewhere?
chroot_init() { chroot_init() {
XBPSSRC_CF=$XBPS_MASTERDIR/etc/xbps/xbps-src.conf
mkdir -p $XBPS_MASTERDIR/etc/xbps mkdir -p $XBPS_MASTERDIR/etc/xbps
cat > $XBPSSRC_CF <<_EOF cat > $XBPS_MASTERDIR/etc/xbps/xbps-src.conf <<_EOF
# Generated configuration file by xbps-src, DO NOT EDIT! # Generated configuration file by xbps-src, DO NOT EDIT!
_EOF $(grep -E '^XBPS_.*' "$XBPS_CONFIG_FILE")
if [ -e "$XBPS_CONFIG_FILE" ]; then
grep -E '^XBPS_.*' $XBPS_CONFIG_FILE >> $XBPSSRC_CF
fi
cat >> $XBPSSRC_CF <<_EOF
XBPS_MASTERDIR=/ XBPS_MASTERDIR=/
XBPS_CFLAGS="$XBPS_CFLAGS" XBPS_CFLAGS="$XBPS_CFLAGS"
XBPS_CXXFLAGS="$XBPS_CXXFLAGS" XBPS_CXXFLAGS="$XBPS_CXXFLAGS"
@ -21,10 +15,9 @@ XBPS_FFLAGS="-fPIC -pipe"
XBPS_CPPFLAGS="$XBPS_CPPFLAGS" XBPS_CPPFLAGS="$XBPS_CPPFLAGS"
XBPS_LDFLAGS="$XBPS_LDFLAGS" XBPS_LDFLAGS="$XBPS_LDFLAGS"
XBPS_HOSTDIR=/host XBPS_HOSTDIR=/host
# End of configuration file.
_EOF _EOF
echo "# End of configuration file." >> $XBPSSRC_CF
# Create custom script to start the chroot bash shell. # Create custom script to start the chroot bash shell.
cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF
#!/bin/sh #!/bin/sh