Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.

[mhmdanas <mhmdanas@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages ci-install-to-new-rootdir
https://github.com/void-linux/void-packages/pull/43304

common/travis: make check-install use new rootdir.
The CI has `base-chroot` installed, but sometimes this script would try to install `base-system,` causing conflicts. This PR fixes that issue by using a brand-new rootdir.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

How should I test this?

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43304.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ci-install-to-new-rootdir-43304.patch --]
[-- Type: text/x-diff, Size: 3085 bytes --]

From 64542c546ef0a5f0566eeaac4e5a63921d00134c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 6 Apr 2023 19:06:26 +0100
Subject: [PATCH 1/2] common/travis: make check-install use new rootdir.

The CI has `base-chroot` installed, but sometimes this script would try
to install `base-system,` causing conflicts. This commit fixes that
issue by using a brand-new rootdir.
---
 common/travis/check-install.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..4f823db9c7aa 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -6,20 +6,27 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 
 if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	triplet="$(/hostrepo/xbps-src -a "$XBPS_TARGET_ARCH" show-var XBPS_CROSS_TRIPLET)"
-	ROOTDIR="-r /usr/$triplet"
+	CONFDIR="-C /usr/$triplet/etc/xbps.d"
+else
+	CONFDIR="-C /etc/xbps.d"
 fi
 
 ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
  --repository=$HOME/hostdir/binpkgs
  --repository=$HOME/hostdir/binpkgs/nonfree"
+ROOTDIR="-r /check-install"
+
+mkdir /check-install
+
+xbps-install $ROOTDIR $ADDREPO $CONFDIR -S
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mTrying to install dependants of $subpkg:\x1b[0m"
 		for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
 			xbps-install \
-				$ROOTDIR $ADDREPO \
-				-Sny \
+				$ROOTDIR $ADDREPO $CONFDIR \
+				-ny \
 				"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
 			ret="$?"
 			if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then

From 859236851c54500b48e431ad514a661e1f5a343e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 3 Apr 2023 22:45:29 +0100
Subject: [PATCH 2/2] traceroute: update to 2.1.2.

---
 srcpkgs/traceroute/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index 73e12c1c4c90..058452d1ca79 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -1,13 +1,13 @@
 # Template file for 'traceroute'
 pkgname=traceroute
-version=2.1.0
-revision=4
+version=2.1.2
+revision=1
 short_desc="Traces the route taken by packets over an IPv4/IPv6 network"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://traceroute.sourceforge.net"
-distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
-checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6
+homepage="https://traceroute.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/traceroute/traceroute-${version}.tar.gz"
+checksum=507c268f2977b4e218ce73e7ebed45ba0d970a8ca4995dd9cbb1ffe8e99b5b1f
 
 alternatives="
  traceroute:traceroute:/usr/bin/linux-traceroute
@@ -21,6 +21,7 @@ do_build() {
 		make CFLAGS="$CFLAGS $CPPFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
 	fi
 }
+
 do_install() {
 	vbin traceroute/traceroute linux-traceroute
 	vman traceroute/traceroute.8 linux-traceroute.8