jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Michal Vasilek 2021-12-15 22:38:17 +01:00 committed by Echo
parent e8c42bd0d1
commit 1ccc884f1c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/xbps-src/shutils/common.sh
View file

@ -472,7 +472,15 @@ setup_pkg() {
fi fi
makejobs="-j$XBPS_MAKEJOBS" makejobs="-j$XBPS_MAKEJOBS"
if [ -n "$XBPS_BINPKG_EXISTS" ]; then 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 [ "$_binpkgver" = "$pkgver" ]; then
if [ -z "$XBPS_DEPENDENCY" ]; then if [ -z "$XBPS_DEPENDENCY" ]; then
local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)" local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"

2
xbps-src
View file

@ -157,7 +157,7 @@ $(print_cross_targets)
-C Do not remove build directory, automatic dependencies and -C Do not remove build directory, automatic dependencies and
package destdir after successful install. 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. do not try to build it, exit immediately.
-f Force running the specified stage (configure/build/install/pkg) -f Force running the specified stage (configure/build/install/pkg)