From ea067cd97fecc6de205841a1fc18ba404d65b9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 20 Oct 2021 12:45:53 +0700 Subject: [PATCH 1/2] chroot-git: update to 2.33.1, allow git-clone local repository --- srcpkgs/chroot-git/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index cda37b356a55..66a46988cdcd 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,7 +1,7 @@ # Template file for 'chroot-git' pkgname=chroot-git -version=2.33.0 -revision=2 +version=2.33.1 +revision=1 bootstrap=yes wrksrc="git-${version}" makedepends="zlib-devel" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f +checksum=e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f if [ "$CHROOT_READY" ]; then checkdepends="perl gnupg" @@ -39,6 +39,8 @@ do_configure() { GIT_PROVE_OPTS = $makejobs # firstword (uname -m) HOST_CPU = ${XBPS_TARGET_MACHINE%-musl} + SKIP_DASHED_BUILT_INS = Yes + gitexecdir = libexec/chroot-git EOF if [ "$XBPS_TARGET_LIBC" = musl ]; then @@ -62,4 +64,8 @@ do_check() { do_install() { vbin git chroot-git + vmkdir usr/libexec/chroot-git + ln -s ../../bin/chroot-git $DESTDIR/usr/libexec/chroot-git/git + ln -s git $DESTDIR/usr/libexec/chroot-git/git-upload-pack + ln -s git $DESTDIR/usr/libexec/chroot-git/git-receive-pack } From 457025bc5b32fde339e5632be2b3dca8e5943611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 20 Oct 2021 12:57:33 +0700 Subject: [PATCH 2/2] test-chroot-git --- common/travis/build.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/common/travis/build.sh b/common/travis/build.sh index f5cf9cffc064..c5ee88a98b1b 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -17,4 +17,24 @@ for pkg in ${PKGS}; do [ $? -eq 1 ] && exit 1 done +xbps-install -R "$HOME"/hostdir/binpkgs -u + +chroot-git clone /void-packages /xhostrepo +ln -s / /xhostrepo/masterdir +cd /xhostrepo +chroot-git fetch +chroot-git reset --hard "$GIT_REV" +cd - + +cat </xhostrepo/etc/conf +XBPS_CHROOT_CMD=ethereal +XBPS_ALLOW_CHROOT_BREAKOUT=yes +! + +if [ "${HOST}" != "${TARGET}" ] ; then + opts="-a ${TARGET}" +fi + +/xhostrepo/xbps-src -H "$HOME"/hostdir pkg git + exit 0