aboutsummaryrefslogtreecommitdiff
path: root/common/hooks/do-fetch
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2020-01-01 10:15:35 +0000
committerJuan RP <xtraeme@gmail.com>2020-01-05 09:44:56 +0000
commit75eca1b03e453d9e643b809550d5157717e46738 (patch)
tree352d46c2ee852e6ce698b42302d0cb9174357b2c /common/hooks/do-fetch
parentb714ffe390f7a2d2df0eeb8a1594d152737ab701 (diff)
downloadvoid-packages-75eca1b03e453d9e643b809550d5157717e46738.tar
void-packages-75eca1b03e453d9e643b809550d5157717e46738.tar.gz
void-packages-75eca1b03e453d9e643b809550d5157717e46738.tar.bz2
void-packages-75eca1b03e453d9e643b809550d5157717e46738.tar.lz
void-packages-75eca1b03e453d9e643b809550d5157717e46738.tar.xz
void-packages-75eca1b03e453d9e643b809550d5157717e46738.tar.zst
void-packages-75eca1b03e453d9e643b809550d5157717e46738.zip
xbps-src: base-chroot-v2 (reduce artifacts/deps)
This patchset contains multiple changes to xbps-src and its required package "base-chroot" for building packages via chroot. - moved xbps.d(5) conf files to `etc/xbps.d`. - renamed xbps.d(5) repository files to `etc/xbps.d/repos-{local,remote}*`. - do not set `--repository` to any xbps command that supports it, xbps-src now simply populates `rootdir/etc/xbps.d` with correct settings (taking care of CHROOT_READY/IN_CHROOT). - Unless `-C` is set (to preserve builddir/destdir/autodeps), when entering to the chroot (if CHROOT_READY is set), xbps-src will clean up the masterdir and then perform a system update to always use a constant set of packages for that exact date. - Improved some normal/error msgs. - Includes support for `xbps>=0.58`. - common/hooks: switch to bsdtar. - base-chroot: - base-chroot-musl is gone, now unified for glibc/musl. - deps removed: gettext, mpfr, readline, texinfo, which, xz. - deps changed: tar -> bsdtar. Effectively this reduces dependencies in `base-chroot`, makes it unified for musl and glibc, switches xbps-src to use `bsdtar` rather than GNU `tar` and `xz`, gets rid of useless host dependencies like GNU gettext, texinfo, etc. I've been testing these changes for 1 month or so already, I was able to build from scratch `base-system` for both native and multiple targets, i.e `./xbps-src -a target -Nt pkg base-system`
Diffstat (limited to 'common/hooks/do-fetch')
-rw-r--r--common/hooks/do-fetch/00-distfiles.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh
index e2220789c59..73239da1c73 100644
--- a/common/hooks/do-fetch/00-distfiles.sh
+++ b/common/hooks/do-fetch/00-distfiles.sh
@@ -50,7 +50,7 @@ contents_cksum() {
case ${cursufx} in
tar|txz|tbz|tlz|tgz|crate)
- cksum=$($XBPS_DIGEST_CMD <(tar xf "$curfile" --to-stdout))
+ cksum=$($XBPS_DIGEST_CMD <(bsdtar xf "$curfile" --list))
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile to pipe.\n"
fi
@@ -95,7 +95,7 @@ contents_cksum() {
fi
;;
gem)
- cksum=$($XBPS_DIGEST_CMD <(tar -xf "$curfile" data.tar.gz --to-stdout | tar -xzO ))
+ cksum=$($XBPS_DIGEST_CMD <(bsdtar -xf "$curfile" data.tar.gz --list | bsdtar -xzO ))
;;
*)
msg_error "$pkgver: cannot guess $curfile extract suffix. ($cursufx)\n"