[PR PATCH] xbps-src: make -E ignore remote repositories with -N

[PR PATCH] xbps-src: make -E ignore remote repositories with -N

[paper42]

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages xbps-src-EN-remote
https://github.com/void-linux/void-packages/pull/34559

xbps-src: make -E ignore remote repositories with -N
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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
-->
@Piraty 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-EN-remote-34559.patch --]
[-- Type: text/x-diff, Size: 1607 bytes --]

From 8b55fd7d4246c86f7b27878b8348c78085f0c5f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Dec 2021 19:34:53 +0100
Subject: [PATCH] xbps-src: make -E ignore remote repositories with -N

---
 common/xbps-src/shutils/common.sh | 4 +++-
 xbps-src                          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 1739124050f7..781d38b6a26b 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -470,7 +470,9 @@ setup_pkg() {
     fi
     makejobs="-j$XBPS_MAKEJOBS"
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
-        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+        local extraflags=""
+        [ -n "$XBPS_SKIP_REMOTEREPOS" ] && extraflags="-i"
+        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
             if [ -z "$XBPS_DEPENDENCY" ]; then
                 local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"
diff --git a/xbps-src b/xbps-src
index ff249015ed02..28ffdaa024a8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -188,7 +188,7 @@ $(print_cross_targets)
     The masterdir is the main directory to build/store/compile packages.
     If unset defaults to void-packages/masterdir.
 
--N  Disable use of remote repositories to resolve dependencies.
+-N  Disable use of remote repositories.
 
 -o  <opt,~opt2,...>
     Enable or disable (prefixed with ~) package build options. If 'etc/conf'

Re: xbps-src: make -E ignore remote repositories with -N

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34559#issuecomment-995175194

Comment:
Are any repositories queried now?

Re: [PR PATCH] [Updated] xbps-src: make -E ignore remote repositories with -N

[paper42]

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

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

https://github.com/paper42/void-packages xbps-src-EN-remote
https://github.com/void-linux/void-packages/pull/34559

xbps-src: make -E ignore remote repositories with -N
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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
-->
@Piraty 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-EN-remote-34559.patch --]
[-- Type: text/x-diff, Size: 1321 bytes --]

From 050becaa7935d096a370e88bd8f2cfc898cbd289 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Dec 2021 22:38:17 +0100
Subject: [PATCH] xbps-src: make -E ignore remote repositories with -N

---
 common/xbps-src/shutils/common.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 1739124050f7..67bf69617b53 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -470,7 +470,15 @@ setup_pkg() {
     fi
     makejobs="-j$XBPS_MAKEJOBS"
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
-        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+        local extraflags=""
+        if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
+            extraflags="-i"
+            # filter out remote repositories
+            for repo in $(xbps-query -L | awk '{ print $2 }' | grep '^/host/'); do
+                extraflags+=" --repository=$repo"
+            done
+        fi
+        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
             if [ -z "$XBPS_DEPENDENCY" ]; then
                 local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"

Re: xbps-src: make -E ignore remote repositories with -N

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34559#issuecomment-995235103

Comment:
> Are any repositories queried now?

hopefully fixed

Re: xbps-src: make -E ignore remote repositories with -N

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34559#issuecomment-995235103

Comment:
> Are any repositories queried now?

hopefully fixed now

Re: [PR PATCH] [Updated] xbps-src: make -E ignore remote repositories with -N

[paper42]

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

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

https://github.com/paper42/void-packages xbps-src-EN-remote
https://github.com/void-linux/void-packages/pull/34559

xbps-src: make -E ignore remote repositories with -N
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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
-->
@Piraty 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-EN-remote-34559.patch --]
[-- Type: text/x-diff, Size: 1893 bytes --]

From 711b73c1424ece96b5d924ccdac8a0f5585e9514 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Dec 2021 22:38:17 +0100
Subject: [PATCH] xbps-src: make -E ignore remote repositories with -N

---
 common/xbps-src/shutils/common.sh | 10 +++++++++-
 xbps-src                          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 1739124050f7..67bf69617b53 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -470,7 +470,15 @@ setup_pkg() {
     fi
     makejobs="-j$XBPS_MAKEJOBS"
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
-        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+        local extraflags=""
+        if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
+            extraflags="-i"
+            # filter out remote repositories
+            for repo in $(xbps-query -L | awk '{ print $2 }' | grep '^/host/'); do
+                extraflags+=" --repository=$repo"
+            done
+        fi
+        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
             if [ -z "$XBPS_DEPENDENCY" ]; then
                 local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"
diff --git a/xbps-src b/xbps-src
index ff249015ed02..5e66ca783cef 100755
--- a/xbps-src
+++ b/xbps-src
@@ -157,7 +157,7 @@ $(print_cross_targets)
 -C  Do not remove build directory, automatic dependencies and
     package destdir after successful install.
 
--E  If a binary package exists in a local repository for the target package,
+-E  If a binary package exists in a repository for the target package,
     do not try to build it, exit immediately.
 
 -f  Force running the specified stage (configure/build/install/pkg)

Re: xbps-src: make -E ignore remote repositories with -N

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34559#issuecomment-995290584

Comment:
Closes #19057

Re: [PR PATCH] [Merged]: xbps-src: make -E ignore remote repositories with -N

[paper42]

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

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

xbps-src: make -E ignore remote repositories with -N
https://github.com/void-linux/void-packages/pull/34559

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

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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
-->
@Piraty