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

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] common/travis: make check-install use new rootdir.
@ 2023-04-06 18:22 mhmdanas
  2023-04-06 18:25 ` classabbyamp
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 18:22 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1492 bytes --]

From ea99d9d518ec2c8ec08a11eacc59b792e5cb177c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 6 Apr 2023 19:06:26 +0100
Subject: [PATCH] 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 | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..5ecea84e640b 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -4,22 +4,19 @@
 
 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"
-fi
-
 ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
  --repository=$HOME/hostdir/binpkgs
  --repository=$HOME/hostdir/binpkgs/nonfree"
 
+mkdir /check-install
+
 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 \
+				$ADDREPO \
+				-Sny -r /check-install \
 				"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
 			ret="$?"
 			if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
@ 2023-04-06 18:25 ` classabbyamp
  2023-04-06 18:25 ` classabbyamp
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2023-04-06 18:25 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43304#issuecomment-1499455790

Comment:
> How should I test this?

add some commits to this pr temporarily (or another PR on your own fork), ideally ones where you got conflicts

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
  2023-04-06 18:25 ` classabbyamp
@ 2023-04-06 18:25 ` classabbyamp
  2023-04-06 18:45 ` [PR PATCH] [Updated] " mhmdanas
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2023-04-06 18:25 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43304#issuecomment-1499455790

Comment:
> How should I test this?

add some commits to this pr temporarily (or another PR on your own fork), ideally ones where you got conflicts before

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
  2023-04-06 18:25 ` classabbyamp
  2023-04-06 18:25 ` classabbyamp
@ 2023-04-06 18:45 ` mhmdanas
  2023-04-06 19:02 ` mhmdanas
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 18:45 UTC (permalink / raw)
  To: ml

[-- 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: 2938 bytes --]

From ea99d9d518ec2c8ec08a11eacc59b792e5cb177c 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 | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..5ecea84e640b 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -4,22 +4,19 @@
 
 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"
-fi
-
 ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
  --repository=$HOME/hostdir/binpkgs
  --repository=$HOME/hostdir/binpkgs/nonfree"
 
+mkdir /check-install
+
 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 \
+				$ADDREPO \
+				-Sny -r /check-install \
 				"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
 			ret="$?"
 			if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then

From 91b3f11991739b04544e7550cab5e979e17e8b28 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (2 preceding siblings ...)
  2023-04-06 18:45 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-04-06 19:02 ` mhmdanas
  2023-04-06 19:36 ` mhmdanas
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 19:02 UTC (permalink / raw)
  To: ml

[-- 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: 2985 bytes --]

From 2c5b80f6a31ca5bd138edc36ccde14bb1942c084 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, 6 insertions(+), 7 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..ebc2d966a5c7 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -4,22 +4,21 @@
 
 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"
-fi
-
 ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
  --repository=$HOME/hostdir/binpkgs
  --repository=$HOME/hostdir/binpkgs/nonfree"
 
+mkdir /check-install
+
+xbps-install $ADDREPO -S -r /check-install
+
 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 \
+				$ADDREPO \
+				-ny -r /check-install \
 				"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
 			ret="$?"
 			if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then

From 892868eabc1de4fe6d064bdc929f2445f83782e5 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (3 preceding siblings ...)
  2023-04-06 19:02 ` mhmdanas
@ 2023-04-06 19:36 ` mhmdanas
  2023-04-06 22:59 ` [PR PATCH] [Updated] " mhmdanas
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 19:36 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/43304#issuecomment-1499526228

Comment:
The current changes don't work properly (https://github.com/void-linux/void-packages/actions/runs/4632178517/jobs/8195938574?pr=43304#step:11:10), any idea how to fix it?

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (4 preceding siblings ...)
  2023-04-06 19:36 ` mhmdanas
@ 2023-04-06 22:59 ` mhmdanas
  2023-04-06 23:13 ` mhmdanas
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 22:59 UTC (permalink / raw)
  To: ml

[-- 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: 2970 bytes --]

From 33ca1507124346078a8a05f19508e51b2e1d907d 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, 7 insertions(+), 6 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..e1d76f927c8e 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -4,14 +4,15 @@
 
 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"
-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 -S
+xbps-query $ROOTDIR $ADDREPO -L
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
@@ -19,7 +20,7 @@ while read -r pkg; do
 		for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
 			xbps-install \
 				$ROOTDIR $ADDREPO \
-				-Sny \
+				-ny \
 				"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
 			ret="$?"
 			if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then

From c6fdd01f0e01d2bc80359cc24bdb35ccf2019945 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (5 preceding siblings ...)
  2023-04-06 22:59 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-04-06 23:13 ` mhmdanas
  2023-04-06 23:20 ` mhmdanas
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 23:13 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (6 preceding siblings ...)
  2023-04-06 23:13 ` mhmdanas
@ 2023-04-06 23:20 ` mhmdanas
  2023-04-06 23:30 ` mhmdanas
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 23:20 UTC (permalink / raw)
  To: ml

[-- 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: 3189 bytes --]

From 4cd99fd33551a976f64d36ddb76d1ca8e2107ef2 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 | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..31dd104f1dfa 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -6,20 +6,30 @@ 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
 
+mkdir /check-install
+
+mkdir -p /check-install/var/db/xbps/keys
+cp /var/db/xbps/keys/* /check-install/var/db/xbps/keys/
+
 ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
  --repository=$HOME/hostdir/binpkgs
  --repository=$HOME/hostdir/binpkgs/nonfree"
+ROOTDIR="-r /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 a4db8dc09b906b999f139b4f98ebbb32302f8a3d 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (7 preceding siblings ...)
  2023-04-06 23:20 ` mhmdanas
@ 2023-04-06 23:30 ` mhmdanas
  2023-04-07 15:28 ` mhmdanas
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-06 23:30 UTC (permalink / raw)
  To: ml

[-- 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: 3255 bytes --]

From 3f2c7cc755102c2006ada5bed9dc23f5e65484be 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 | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..d6bc36410761 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -6,20 +6,30 @@ 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
 
+mkdir /check-install
+
+mkdir -p /check-install/var/db/xbps/keys
+cp /var/db/xbps/keys/* /check-install/var/db/xbps/keys/
+
 ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
  --repository=$HOME/hostdir/binpkgs
  --repository=$HOME/hostdir/binpkgs/nonfree"
+ROOTDIR="-r /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
+		for dep in $(xbps-query $ADDREPO $CONFDIR -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 ee9ccbdadc983e9df6e1ce7ee911cd5d69824e21 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (8 preceding siblings ...)
  2023-04-06 23:30 ` mhmdanas
@ 2023-04-07 15:28 ` mhmdanas
  2023-04-07 15:35 ` mhmdanas
  2023-04-11 20:16 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-07 15:28 UTC (permalink / raw)
  To: ml

[-- 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: 1745 bytes --]

From 4b017cd677351e42b3e503d761acf48edc0f9b40 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 6 Apr 2023 19:06:26 +0100
Subject: [PATCH] common/travis: make check-install use clean 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 | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211c..31dd104f1dfa 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -6,20 +6,30 @@ 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
 
+mkdir /check-install
+
+mkdir -p /check-install/var/db/xbps/keys
+cp /var/db/xbps/keys/* /check-install/var/db/xbps/keys/
+
 ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
  --repository=$HOME/hostdir/binpkgs
  --repository=$HOME/hostdir/binpkgs/nonfree"
+ROOTDIR="-r /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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (9 preceding siblings ...)
  2023-04-07 15:28 ` mhmdanas
@ 2023-04-07 15:35 ` mhmdanas
  2023-04-11 20:16 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-04-07 15:35 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/43304#issuecomment-1500395251

Comment:
I noticed that both with this PR's changes and without, no packages (other than those built in the PR's CI) were installed in the check-install step on cross-built archs (e.g. https://github.com/void-linux/void-packages/actions/runs/4622120371/jobs/8174400159#step:11:9). I briefly tried to fix that in this PR yesterday, but wasn't able to. Is it okay to leave it to another PR?

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Merged]: common/travis: make check-install use new rootdir.
  2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
                   ` (10 preceding siblings ...)
  2023-04-07 15:35 ` mhmdanas
@ 2023-04-11 20:16 ` classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2023-04-11 20:16 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

common/travis: make check-install use new rootdir.
https://github.com/void-linux/void-packages/pull/43304

Description:
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
-->


^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-04-11 20:16 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-06 18:22 [PR PATCH] common/travis: make check-install use new rootdir mhmdanas
2023-04-06 18:25 ` classabbyamp
2023-04-06 18:25 ` classabbyamp
2023-04-06 18:45 ` [PR PATCH] [Updated] " mhmdanas
2023-04-06 19:02 ` mhmdanas
2023-04-06 19:36 ` mhmdanas
2023-04-06 22:59 ` [PR PATCH] [Updated] " mhmdanas
2023-04-06 23:13 ` mhmdanas
2023-04-06 23:20 ` mhmdanas
2023-04-06 23:30 ` mhmdanas
2023-04-07 15:28 ` mhmdanas
2023-04-07 15:35 ` mhmdanas
2023-04-11 20:16 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).