jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: introduce XBPS_REPO_COMPTYPE for etc/conf.

Browse source 
This sets the repository data compression format, as explained
in xbps-rindex(1). By default set to `gzip'.
This commit is contained in:
Juan RP 2019-06-25 10:52:37 +02:00
parent 3ad7858f09
commit 67cd850ebf
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/xbps-src/libexec/build.sh
View file

@ -103,13 +103,16 @@ cut -d: -f 1,2 ${XBPS_STATEDIR}/.${sourcepkg}_register_pkg | sort -u | \
cut -d : -f 2,3 | tr ':' '/') cut -d : -f 2,3 | tr ':' '/')
if [ -n "${arch}" ]; then if [ -n "${arch}" ]; then
msg_normal "Registering new packages to $repo ($arch)\n" msg_normal "Registering new packages to $repo ($arch)\n"
XBPS_TARGET_ARCH=${arch} $XBPS_RINDEX_CMD ${XBPS_BUILD_FORCEMODE:+-f} -a ${paths} XBPS_TARGET_ARCH=${arch} $XBPS_RINDEX_CMD \
${XBPS_REPO_COMPTYPE:+--compression $XBPS_REPO_COMPTYPE} ${XBPS_BUILD_FORCEMODE:+-f} -a ${paths}
else else
msg_normal "Registering new packages to $repo\n" msg_normal "Registering new packages to $repo\n"
if [ -n "$XBPS_CROSS_BUILD" ]; then if [ -n "$XBPS_CROSS_BUILD" ]; then
$XBPS_RINDEX_XCMD ${XBPS_BUILD_FORCEMODE:+-f} -a ${paths} $XBPS_RINDEX_XCMD ${XBPS_REPO_COMPTYPE:+--compression $XBPS_REPO_COMPTYPE} \
${XBPS_BUILD_FORCEMODE:+-f} -a ${paths}
else else
$XBPS_RINDEX_CMD ${XBPS_BUILD_FORCEMODE:+-f} -a ${paths} $XBPS_RINDEX_CMD ${XBPS_REPO_COMPTYPE:+--compression $XBPS_REPO_COMPTYPE} \
${XBPS_BUILD_FORCEMODE:+-f} -a ${paths}
fi fi
fi fi
done done

6
etc/defaults.conf
View file

@ -83,6 +83,12 @@ XBPS_SUCMD="sudo /bin/sh -c"
# #
#XBPS_PKG_COMPTYPE=none #XBPS_PKG_COMPTYPE=none
# [OPTIONAL]
# Set the repository compression format (defaults to gzip/zlib). See xbps-rindex(1)
# for the available formats.
#
#XBPS_REPO_COMPTYPE=zstd
# [OPTIONAL] # [OPTIONAL]
# Enable or disable global package build options, these options apply # Enable or disable global package build options, these options apply
# to all packages that support the matching options. # to all packages that support the matching options.

2
xbps-src
View file

@ -619,7 +619,7 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
XBPS_KEEP_ALL XBPS_HOSTDIR XBPS_MASTERDIR XBPS_SRC_VERSION \ XBPS_KEEP_ALL XBPS_HOSTDIR XBPS_MASTERDIR XBPS_SRC_VERSION \
XBPS_DESTDIR XBPS_MACHINE XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \ XBPS_DESTDIR XBPS_MACHINE XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
XBPS_LIBEXECDIR XBPS_DISTDIR XBPS_DISTFILES_MIRROR XBPS_ALLOW_RESTRICTED \ XBPS_LIBEXECDIR XBPS_DISTDIR XBPS_DISTFILES_MIRROR XBPS_ALLOW_RESTRICTED \
XBPS_USE_GIT_COMMIT_DATE XBPS_PKG_COMPTYPE XBPS_BUILDHELPERDIR XBPS_USE_GIT_COMMIT_DATE XBPS_PKG_COMPTYPE XBPS_REPO_COMPTYPE XBPS_BUILDHELPERDIR
for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
eval val="\$XBPS_$i" eval val="\$XBPS_$i"