teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

various: change default repo to repo-default.voidlinux.org

This commit is contained in:
Michael Aldridge 2022-05-23 21:08:02 -05:00
parent 7861a044b3
commit 3a5377265a
21 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/issue_template.md vendored
View File

@ -1,4 +1,4 @@
<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt. However, a quality pull request may help. --> <!-- Don't request update of package. We have a script for that. https://repo-default.voidlinux.org/void-updates/void-updates.txt. However, a quality pull request may help. -->
### System ### System
* xuname: * xuname:

2
README.md
View File

@ -431,7 +431,7 @@ xbps-src can be used in any recent Linux distribution matching the CPU architect
To use xbps-src in your Linux distribution use the following instructions. Let's start downloading the xbps static binaries: To use xbps-src in your Linux distribution use the following instructions. Let's start downloading the xbps static binaries:
$ wget http://alpha.de.repo.voidlinux.org/static/xbps-static-latest.<arch>-musl.tar.xz $ wget http://repo-default.voidlinux.org/static/xbps-static-latest.<arch>-musl.tar.xz
$ mkdir ~/XBPS $ mkdir ~/XBPS
$ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
$ export PATH=~/XBPS/usr/bin:$PATH $ export PATH=~/XBPS/usr/bin:$PATH

2
common/travis/fetch-xbps.sh
View File

@ -7,7 +7,7 @@ TAR=tar
command -v bsdtar >/dev/null && TAR=bsdtar command -v bsdtar >/dev/null && TAR=bsdtar
ARCH=$(uname -m)-musl ARCH=$(uname -m)-musl
VERSION=0.59_5 VERSION=0.59_5
URL="https://alpha.de.repo.voidlinux.org/static/xbps-static-static-${VERSION}.${ARCH}.tar.xz" URL="https://repo-default.voidlinux.org/static/xbps-static-static-${VERSION}.${ARCH}.tar.xz"
FILE=${URL##*/} FILE=${URL##*/}
mkdir -p /tmp/bin mkdir -p /tmp/bin

9
common/travis/set_mirror.sh
View File

@ -1,15 +1,8 @@
#!/bin/sh #!/bin/sh
TRAVIS_PROTO=http
TRAVIS_MIRROR=repo-us.voidlinux.org TRAVIS_MIRROR=repo-us.voidlinux.org
for _i in etc/xbps.d/repos-remote*.conf ; do for _i in etc/xbps.d/repos-remote*.conf ; do
/bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m" /bin/echo -e "\x1b[32mUpdating $_i...\x1b[0m"
# First fix the proto, ideally we'd serve everything with HTTPS, sed -i "s:repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
# but key management and rotation is a pain, and things are signed
# so we can afford to be a little lazy at times.
sed -i "s:https:$TRAVIS_PROTO:g" $_i
# Now set the mirror
sed -i "s:alpha\.de\.repo\.voidlinux\.org:$TRAVIS_MIRROR:g" $_i
done done

6
etc/xbps.d/repos-remote-aarch64-musl.conf
View File

@ -1,4 +1,4 @@
# aarch64 voidlinux remote repositories # aarch64 voidlinux remote repositories
repository=https://alpha.de.repo.voidlinux.org/current/aarch64 repository=https://repo-default.voidlinux.org/current/aarch64
repository=https://alpha.de.repo.voidlinux.org/current/aarch64/nonfree repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
repository=https://alpha.de.repo.voidlinux.org/current/aarch64/debug repository=https://repo-default.voidlinux.org/current/aarch64/debug

6
etc/xbps.d/repos-remote-aarch64.conf
View File

@ -1,4 +1,4 @@
# aarch64 voidlinux remote repositories # aarch64 voidlinux remote repositories
repository=https://alpha.de.repo.voidlinux.org/current/aarch64 repository=https://repo-default.voidlinux.org/current/aarch64
repository=https://alpha.de.repo.voidlinux.org/current/aarch64/nonfree repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
repository=https://alpha.de.repo.voidlinux.org/current/aarch64/debug repository=https://repo-default.voidlinux.org/current/aarch64/debug

6
etc/xbps.d/repos-remote-musl.conf
View File

@ -1,4 +1,4 @@
# voidlinux remote repositories (musl) # voidlinux remote repositories (musl)
repository=https://alpha.de.repo.voidlinux.org/current/musl repository=https://repo-default.voidlinux.org/current/musl
repository=https://alpha.de.repo.voidlinux.org/current/musl/nonfree repository=https://repo-default.voidlinux.org/current/musl/nonfree
repository=https://alpha.de.repo.voidlinux.org/current/musl/debug repository=https://repo-default.voidlinux.org/current/musl/debug

4
etc/xbps.d/repos-remote-x86_64-multilib.conf
View File

@ -1,3 +1,3 @@
# voidlinux remote repositories (x86_64/glibc) # voidlinux remote repositories (x86_64/glibc)
repository=https://alpha.de.repo.voidlinux.org/current/multilib repository=https://repo-default.voidlinux.org/current/multilib
repository=https://alpha.de.repo.voidlinux.org/current/multilib/nonfree repository=https://repo-default.voidlinux.org/current/multilib/nonfree

6
etc/xbps.d/repos-remote.conf
View File

@ -1,4 +1,4 @@
# voidlinux remote repositories (glibc) # voidlinux remote repositories (glibc)
repository=https://alpha.de.repo.voidlinux.org/current repository=https://repo-default.voidlinux.org/current
repository=https://alpha.de.repo.voidlinux.org/current/nonfree repository=https://repo-default.voidlinux.org/current/nonfree
repository=https://alpha.de.repo.voidlinux.org/current/debug repository=https://repo-default.voidlinux.org/current/debug

2
srcpkgs/9base/template
View File

@ -13,7 +13,7 @@ license="custom:Plan9"
homepage="http://git.suckless.org/9base" homepage="http://git.suckless.org/9base"
# Checked out from http://git.suckless.org/9base/ and created tarball with # Checked out from http://git.suckless.org/9base/ and created tarball with
# git archive -o 9base-${_githash}.tar.gz --prefix=9base/ master . # git archive -o 9base-${_githash}.tar.gz --prefix=9base/ master .
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/9base-${_githash}.tar.gz" distfiles="https://repo-default.voidlinux.org/distfiles/9base-${_githash}.tar.gz"
checksum=b315509470c25db88595bd0e9478428dea54d7836fe2ba9d07279ae9496366fb checksum=b315509470c25db88595bd0e9478428dea54d7836fe2ba9d07279ae9496366fb
conflicts="plan9port" conflicts="plan9port"
provides="plan9port-20160418_4" provides="plan9port-20160418_4"

2
srcpkgs/cargo-bootstrap/template
View File

@ -19,7 +19,7 @@ _bootver=1.57.0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
x86_64*|i686|ppc64le) ;; x86_64*|i686|ppc64le) ;;
*) *)
_bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles" _bootstrap_url="https://repo-default.voidlinux.org/distfiles"
_bootver=${version} _bootver=${version}
;; ;;
esac esac

2
srcpkgs/fastttyrec/template
View File

@ -7,7 +7,7 @@ short_desc="Compress ttyrec recordings"
maintainer="Andrew Benson <abenson+void@gmail.com>" maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://web.archive.org/web/20170709180030/http://www.phong.org/nethack/" homepage="https://web.archive.org/web/20170709180030/http://www.phong.org/nethack/"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version}.tar.bz2" distfiles="https://repo-default.voidlinux.org/distfiles/${pkgname}-${version}.tar.bz2"
checksum=a366562d3a38220779f2da2d4d6ec4c868ab17d6530b9a37c4eb12499e1e911a checksum=a366562d3a38220779f2da2d4d6ec4c868ab17d6530b9a37c4eb12499e1e911a
do_install() { do_install() {

12
srcpkgs/ghc-bin/template
View File

@ -21,7 +21,7 @@ x86_64)
;; ;;
x86_64-musl) x86_64-musl)
# create with "make binary-dist" # create with "make binary-dist"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz" distfiles="https://repo-default.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
checksum=e21eaddeffcd5de7abe43b1f3982a3bc2c5b5f408d2574857cb2b0368106e12c checksum=e21eaddeffcd5de7abe43b1f3982a3bc2c5b5f408d2574857cb2b0368106e12c
;; ;;
i686) i686)
@ -29,24 +29,24 @@ i686)
checksum=fdeb9f8928fbe994064778a8e1e85bb1a58a6cd3dd7b724fcc2a1dcfda6cad47 checksum=fdeb9f8928fbe994064778a8e1e85bb1a58a6cd3dd7b724fcc2a1dcfda6cad47
;; ;;
ppc64le) ppc64le)
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz" distfiles="https://repo-default.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
checksum=7de8114c991f9a2a3b0f5e472da76e3956be6447efec4b1157f14e707049f22d checksum=7de8114c991f9a2a3b0f5e472da76e3956be6447efec4b1157f14e707049f22d
;; ;;
ppc64le-musl) ppc64le-musl)
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz" distfiles="https://repo-default.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz"
checksum=37de8e069712307c9b2039e92f56e540e80ca1390dd27aa247ebe18c40e0c629 checksum=37de8e069712307c9b2039e92f56e540e80ca1390dd27aa247ebe18c40e0c629
;; ;;
ppc64) ppc64)
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz" distfiles="https://repo-default.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602 checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602
;; ;;
aarch64) aarch64)
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux.tar.xz" distfiles="https://repo-default.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux.tar.xz"
checksum=44a20a896246dce64392b7d0feedd0a28a9d733245a803e95dbe4b4b7e15b4fd checksum=44a20a896246dce64392b7d0feedd0a28a9d733245a803e95dbe4b4b7e15b4fd
depends+=" llvm" depends+=" llvm"
;; ;;
aarch64-musl) aarch64-musl)
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux-musl.tar.xz" distfiles="https://repo-default.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux-musl.tar.xz"
checksum=de98e2ff33a25cb32a28c738066fecacb736a33cac12688876eec4eb96d88607 checksum=de98e2ff33a25cb32a28c738066fecacb736a33cac12688876eec4eb96d88607
depends+=" llvm" depends+=" llvm"
;; ;;

2
srcpkgs/libfetch/template
View File

@ -8,7 +8,7 @@ short_desc="File Transfer Library for URLs"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://www.NetBSD.org" homepage="https://www.NetBSD.org"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/libfetch-${version}.tar.xz" distfiles="https://repo-default.voidlinux.org/distfiles/libfetch-${version}.tar.xz"
checksum=4e6d4541f213c9ab42ea94d49c2573f0a6f54b04f14668530960f1424b04f722 checksum=4e6d4541f213c9ab42ea94d49c2573f0a6f54b04f14668530960f1424b04f722
do_build() { do_build() {

4
srcpkgs/lxc/files/lxc-void
View File

@ -154,7 +154,7 @@ EOF
rm -f ${vkb64} rm -f ${vkb64}
mkdir -p ${rootfs}/usr/share/xbps.d mkdir -p ${rootfs}/usr/share/xbps.d
echo "repository=http://alpha.de.repo.voidlinux.org/current" > ${rootfs}/usr/share/xbps.d/00-repository-main.conf echo "repository=http://repo-default.voidlinux.org/current" > ${rootfs}/usr/share/xbps.d/00-repository-main.conf
if ! xbps-install ${xbps_cachedir:+ -c $xbps_cachedir} \ if ! xbps-install ${xbps_cachedir:+ -c $xbps_cachedir} \
${xbps_config:+-C $xbps_config} -r "${rootfs}" \ ${xbps_config:+-C $xbps_config} -r "${rootfs}" \
@ -232,7 +232,7 @@ fi
type xbps-install >/dev/null 2>&1 type xbps-install >/dev/null 2>&1
if [ ${?} -ne 0 ]; then if [ ${?} -ne 0 ]; then
echo "'xbps-install' command is missing, download xbps from http://alpha.de.repo.voidlinux.org/static/" echo "'xbps-install' command is missing, download xbps from http://repo-default.voidlinux.org/static/"
exit 1 exit 1
fi fi

2
srcpkgs/rtmpdump/template
View File

@ -9,7 +9,7 @@ short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later" license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://rtmpdump.mplayerhq.hu/" homepage="http://rtmpdump.mplayerhq.hu/"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz" distfiles="https://repo-default.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz"
checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f
CFLAGS="-Wno-unused-const-variable -Wno-unused-but-set-variable" CFLAGS="-Wno-unused-const-variable -Wno-unused-but-set-variable"

2
srcpkgs/rust-bootstrap/template
View File

@ -19,7 +19,7 @@ _bootstrap_url="https://static.rust-lang.org/dist"
case "$XBPS_MACHINE" in case "$XBPS_MACHINE" in
x86_64*|i686|ppc64le|ppc) ;; x86_64*|i686|ppc64le|ppc) ;;
*) _bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles";; *) _bootstrap_url="https://repo-default.voidlinux.org/distfiles";;
esac esac
distfiles=" distfiles="

2
srcpkgs/rust/template
View File

@ -5,7 +5,7 @@
# See: https://github.com/rust-lang/core-team/issues/4 # See: https://github.com/rust-lang/core-team/issues/4
# #
# Always make sure custom distfiles used for bootstrap are # Always make sure custom distfiles used for bootstrap are
# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/ # uploaded to https://repo-default.voidlinux.org/distfiles/
# #
pkgname=rust pkgname=rust
version=1.57.0 version=1.57.0

4
srcpkgs/void-repo-multilib/template
View File

@ -1,7 +1,7 @@
# Template file for 'void-repo-multilib' # Template file for 'void-repo-multilib'
pkgname=void-repo-multilib pkgname=void-repo-multilib
version=6 version=6
revision=3 revision=4
build_style=meta build_style=meta
archs="x86_64" archs="x86_64"
short_desc="Void Linux drop-in file for the multilib repository" short_desc="Void Linux drop-in file for the multilib repository"
@ -12,7 +12,7 @@ homepage="http://www.voidlinux.org"
do_install() { do_install() {
vmkdir usr/share/xbps.d vmkdir usr/share/xbps.d
for f in multilib multilib-nonfree; do for f in multilib multilib-nonfree; do
echo "repository=https://alpha.de.repo.voidlinux.org/current/${f/-/\/}" > \ echo "repository=https://repo-default.voidlinux.org/current/${f/-/\/}" > \
${DESTDIR}/usr/share/xbps.d/10-repository-${f}.conf ${DESTDIR}/usr/share/xbps.d/10-repository-${f}.conf
done done
} }

14
srcpkgs/void-repo-nonfree/template
View File

@ -1,7 +1,7 @@
# Template file for 'void-repo-nonfree' # Template file for 'void-repo-nonfree'
pkgname=void-repo-nonfree pkgname=void-repo-nonfree
version=9 version=9
revision=5 revision=6
build_style=meta build_style=meta
short_desc="Void Linux drop-in file for the nonfree repository" short_desc="Void Linux drop-in file for the nonfree repository"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
@ -12,21 +12,21 @@ do_install() {
vmkdir usr/share/xbps.d vmkdir usr/share/xbps.d
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
aarch64*) aarch64*)
echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64/nonfree" > \ echo "repository=https://repo-default.voidlinux.org/current/aarch64/nonfree" > \
${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf ${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf
echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64/debug" > \ echo "repository=https://repo-default.voidlinux.org/current/aarch64/debug" > \
${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf ${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf
;; ;;
*-musl) *-musl)
echo "repository=https://alpha.de.repo.voidlinux.org/current/musl/nonfree" > \ echo "repository=https://repo-default.voidlinux.org/current/musl/nonfree" > \
${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf ${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf
echo "repository=https://alpha.de.repo.voidlinux.org/current/musl/debug" > \ echo "repository=https://repo-default.voidlinux.org/current/musl/debug" > \
${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf ${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf
;; ;;
*) *)
echo "repository=https://alpha.de.repo.voidlinux.org/current/nonfree" > \ echo "repository=https://repo-default.voidlinux.org/current/nonfree" > \
${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf ${DESTDIR}/usr/share/xbps.d/10-repository-nonfree.conf
echo "repository=https://alpha.de.repo.voidlinux.org/current/debug" > \ echo "repository=https://repo-default.voidlinux.org/current/debug" > \
${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf ${DESTDIR}/usr/share/xbps.d/20-repository-debug.conf
;; ;;
esac esac

4
srcpkgs/xbps/template
View File

@ -1,7 +1,7 @@
# Template file for 'xbps' # Template file for 'xbps'
pkgname=xbps pkgname=xbps
version=0.59.1 version=0.59.1
revision=5 revision=6
bootstrap=yes bootstrap=yes
build_style=configure build_style=configure
short_desc="XBPS package system utilities" short_desc="XBPS package system utilities"
@ -35,7 +35,7 @@ do_configure() {
} }
post_install() { post_install() {
local repo="https://alpha.de.repo.voidlinux.org/current" suffix= local repo="https://repo-default.voidlinux.org/current" suffix=
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
aarch64*) suffix="/aarch64";; aarch64*) suffix="/aarch64";;
*-musl) suffix="/musl";; *-musl) suffix="/musl";;