Infrastructure changes to simplify the conf file.
* Removed the following vars from the conf file: XBPS_BUILDDIR, XBPS_PACKAGESDIR and XBPS_SRCDISTDIR. They are always relative to XBPS_MASTERDIR and cannot be changed. * Removed XBPS_INSTALLDIR, it was unused in the code. * Prepend /tools/bin in PATH for the chroot. * Don't register a repo in the chroot if the XBPS_PREFER_BINPKG_DEPS is not set. --HG-- extra : convert_revision : 4df03ffa64f0bbf81cd1dd0baf38f1b7e4f47549
This commit is contained in:
parent
7c38045a0f
commit
6673252679
6 changed files with 32 additions and 59 deletions
|
@ -4,12 +4,9 @@ CONF_FILE = xbps-src.conf
|
|||
|
||||
.PHONY: all
|
||||
all:
|
||||
sed -e "s|@@XBPS_INSTALL_PREFIX@@|$(PREFIX)|g" \
|
||||
$(CONF_FILE).in > $(CONF_FILE)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
-rm -f $(CONF_FILE)
|
||||
|
||||
.PHONY: install
|
||||
install:
|
||||
|
|
|
@ -2,12 +2,6 @@
|
|||
# Configuration file for xbps-src.
|
||||
#
|
||||
|
||||
#
|
||||
# Directory where xbps-src has been installed. By default /usr/local.
|
||||
# Usually you don't have to change this one, it's set by "make install".
|
||||
#
|
||||
XBPS_INSTALLDIR=@@XBPS_INSTALL_PREFIX@@
|
||||
|
||||
#
|
||||
# Directory where the xbps-src GIT repository is stored. This is
|
||||
# required to be mounted in the chroot.
|
||||
|
@ -19,23 +13,6 @@ XBPS_DISTRIBUTIONDIR=$HOME/xbps-templates
|
|||
#
|
||||
XBPS_MASTERDIR=$XBPS_DISTRIBUTIONDIR/masterdir
|
||||
|
||||
#
|
||||
# Directory where a local binary package repository is available
|
||||
# (or will be created from). Packages will be stored here.
|
||||
#
|
||||
XBPS_PACKAGESDIR=$XBPS_DISTRIBUTIONDIR/packages
|
||||
|
||||
#
|
||||
# Directory where source files will be extracted to and build object
|
||||
# files will live on.
|
||||
#
|
||||
XBPS_BUILDDIR=$XBPS_DISTRIBUTIONDIR/builddir
|
||||
|
||||
#
|
||||
# Directory where source distribution files are stored.
|
||||
#
|
||||
XBPS_SRCDISTDIR=$XBPS_DISTRIBUTIONDIR/srcdistdir
|
||||
|
||||
#
|
||||
# Compilation flags for cc and c++.
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue