xbps-src: infrastructure changes required for "nonfree" keyword in tmpls.
- The chroot target now execs masterdir/bin/xbps-shell to set up correct envvars. - 2 pkgs are now in nonfree repo: adobe-flash-plugin and jre. - Renamed some vars in xbps-src to be in uppercase, notably XBPS_MACHINE. - make-repoidx target now creates the index for all "known" directories specified via XBPS_PACKAGESDIR: XBPS_MACHINE, noarch, and nonfree/XBPS_MACHINE.
This commit is contained in:
parent
e5afc541f2
commit
5a2cc5b5bd
35 changed files with 173 additions and 146 deletions
|
@ -25,13 +25,11 @@
|
|||
|
||||
set_defvars()
|
||||
{
|
||||
local DDIRS i instsharedir
|
||||
local DDIRS i
|
||||
|
||||
instsharedir=@@XBPS_INSTALL_SHAREDIR@@
|
||||
|
||||
XBPS_HELPERSDIR=$instsharedir/helpers
|
||||
XBPS_SHUTILSDIR=$instsharedir/shutils
|
||||
XBPS_COMMONVARSDIR=$instsharedir/common
|
||||
XBPS_HELPERSDIR=@@XBPS_INSTALL_SHAREDIR@@/helpers
|
||||
XBPS_SHUTILSDIR=@@XBPS_INSTALL_SHAREDIR@@/shutils
|
||||
XBPS_COMMONVARSDIR=@@XBPS_INSTALL_SHAREDIR@@/common
|
||||
XBPS_META_PATH=$XBPS_MASTERDIR/var/db/xbps
|
||||
XBPS_PKGMETADIR=$XBPS_META_PATH/metadata
|
||||
XBPS_SRCPKGDIR=$XBPS_DISTRIBUTIONDIR/srcpkgs
|
||||
|
@ -70,8 +68,8 @@ set_defvars()
|
|||
fi
|
||||
done
|
||||
|
||||
xver=$(xbps-bin.static -V|awk '{print $2}')
|
||||
case "${xver}" in
|
||||
export XBPS_VERSION=$(xbps-bin.static -V|awk '{print $2}')
|
||||
case "${XBPS_VERSION}" in
|
||||
0.1[0-9].[0-9]*)
|
||||
xbps_conf="-C $XBPS_MASTERDIR/usr/local/etc/xbps"
|
||||
;;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue