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

xbps-src: chroot_init: do not propagate XBPS_MASTERDIR to the generated xbps-src.conf.

Browse source 
Fixes Ypnose issue where he has XBPS_MASTERDIR set in `etc/conf`.
This commit is contained in:
Juan RP 2014-07-05 16:12:14 +02:00
parent 9267a054d7
commit 4d55b696c3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,11 @@ chroot_init() {
cat > $XBPSSRC_CF <<_EOF cat > $XBPSSRC_CF <<_EOF
# Generated configuration file by xbps-src, DO NOT EDIT! # Generated configuration file by xbps-src, DO NOT EDIT!
_EOF
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"
@ -12,9 +17,6 @@ XBPS_CPPFLAGS="$XBPS_CPPFLAGS"
XBPS_LDFLAGS="$XBPS_LDFLAGS" XBPS_LDFLAGS="$XBPS_LDFLAGS"
XBPS_HOSTDIR=/host XBPS_HOSTDIR=/host
_EOF _EOF
if [ -n "$XBPS_CONFIG_FILE" -a -e "$XBPS_CONFIG_FILE" ]; then
grep -E '^XBPS_.*' $XBPS_CONFIG_FILE >> $XBPSSRC_CF
fi
echo "# End of configuration file." >> $XBPSSRC_CF echo "# End of configuration file." >> $XBPSSRC_CF