Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository
@ 2022-10-10 18:27 classabbyamp
  2022-10-10 18:33 ` ahesford
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: classabbyamp @ 2022-10-10 18:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 30046 bytes --]

From d2873ff5dc00785f477d40925aba49743eb074c6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/24] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..f54ce4a01e5c 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -2,3 +2,4 @@
 # x86_64/glibc local repositories
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
+repository=/host/binpkgs/multilib/bootstrap
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..d1ac2b86ebdc 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -3,3 +3,4 @@
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
+repository=/host/binpkgs/bootstrap
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..c31896136289 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..c31896136289 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..a26ee1721ced 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..3cf76ab915fc 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..55929049e86c 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug
+repository=https://repo-default.voidlinux.org/current/bootstrap

From 73e2a7ba89dc6a6fe2ac71f2fb317c9ca770878a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/24] common/xbps-src/shutils/: add bootstrap repo

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

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index b0c39b2b7398..2e6beedf549a 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -R "${XBPS_REPOSITORY}/bootstrap" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree --repository=$XBPS_REPOSITORY/bootstrap -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a7100d4ea56f..b898955cc414 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -213,11 +213,13 @@ chroot_sync_repodata() {
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
+            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap"; \
             ) > $confdir/00-repository-alt-local.conf
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
             ( \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
+                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap"; \
             ) >> $confdir/00-repository-alt-local.conf
         fi
     else

From 40996f23c333d438ceab8700c2df41ae5b38e58a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/24] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..70309af4a3fe 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree" "--repository=${binpkgs}/bootstrap")
 rv=0
 
 template_exists() {

From c8c13f375b9a768e6fe0a356eea99f60fa605591 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/24] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 1 +
 common/travis/xpkgdiff.sh      | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..e7319b8d441a 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree
+ --repository=$HOME/hostdir/binpkgs/bootstrap"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..2fbae7e94006 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -9,6 +9,7 @@ while read -r pkg; do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
 		xbps-query --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
+				   --repository=$HOME/hostdir/binpkgs/bootstrap \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
 	done
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 7caabe4b0b71..a2eb9b7b166c 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -11,6 +11,7 @@ while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		if xbps-query --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  --repository=$HOME/hostdir/binpkgs/bootstrap \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
 			xpkgdiff $ARGS -f $subpkg

From 10daae86ec40ccbf375b9d1961cdd98545431f05 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/24] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index e122099fabcb..8fcf95447642 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-bash'
 pkgname=chroot-bash
 version=5.1.004
-revision=1
+revision=2
 _bash_distver=${version%.*}
 _bash_patchlevel=${version##*.}
 _patchprefix="bash${_bash_distver/./}"
@@ -16,6 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 42a637a81c67c305677c21801f68c5ee199e3e14 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/24] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index bb4e61983990..fad6ff11b347 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-distcc'
 pkgname=chroot-distcc
 version=3.3.3
-revision=1
+revision=2
 wrksrc="distcc-${version}"
 bootstrap=yes
 build_style=gnu-configure
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From 265c61e7556c0a7eddbae79db9282ae0a7353d03 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/24] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index c6d5e7441b5d..fedd6c0ea43e 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-gawk'
 pkgname=chroot-gawk
 version=5.0.1
-revision=1
+revision=2
 wrksrc="gawk-${version}"
 build_style=gnu-configure
 configure_args="--disable-nls --without-readline ac_cv_libsigsegv=/bin/false"
@@ -11,6 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 56c03b5f280283492fc85aec25498f8917ee6128 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/24] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 854ec7c2a168..5f1d19a36233 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
 version=2.38.0
-revision=1
+revision=2
 bootstrap=yes
 wrksrc="git-${version}"
 makedepends="zlib-devel"
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From 67b97a8c0645f473346c030a50f0675acc229853 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/24] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 468249d87ebc..e1f882484eeb 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-grep'
 pkgname=chroot-grep
 version=3.7
-revision=1
+revision=2
 wrksrc="grep-${version}"
 bootstrap=yes
 build_style=gnu-configure
@@ -15,6 +15,7 @@ checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From f01081e9042f4a5e3af7369518cd56ef9f58d934 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/24] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index a4ff6337ba1a..28ba7e1a7af8 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-util-linux'
 pkgname=chroot-util-linux
 version=2.32.1
-revision=2
+revision=3
 wrksrc="${pkgname/chroot-/}-${version}"
 bootstrap=yes
 build_style=gnu-configure
@@ -21,6 +21,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From de43301875de52babf26e83b387dd74966a09f7e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/24] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index eb8c4204a6cd..a8f766585ddc 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.84.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp librtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -87,6 +87,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From c23715832a58078f54ca176568ffdef8e781852f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/24] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 43d0b0049b5a..a2b784552edb 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-bootstrap'
 pkgname=cargo-bootstrap
 version=1.63.0
-revision=1
+revision=2
 short_desc="Bootstrap binaries of Rust package manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, Apache-2.0"
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From 877435d28a261ec76097662154c71a651781e345 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 13/24] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..ff1d0260d21d 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'dmd-bootstrap'
 pkgname=dmd-bootstrap
 version=2.069.20180305
-revision=3
+revision=4
 _gitrev_dmd=75266348c8a2368945a339ab86d7c8960a9bfc08
 _gitrev_druntime=33ae38cef41564b12864470afaf8430eb7334d3b
 _gitrev_phobos=30ac23a0889dd183221ce531a057171dd45296c4
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From debf40552dbd16cc040a98c0a5560cccb693e916 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/24] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 977357eaf312..0da29f642f1b 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'go1.12-bootstrap'
 pkgname=go1.12-bootstrap
 version=1.12.17
-revision=2
+revision=3
 archs="x86_64* i686* armv[67]l* aarch64* ppc64le*"
 wrksrc="go"
 short_desc="Go 1.12 (bootstrap compiler)"
@@ -12,6 +12,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From bd3d1116ee276add61c8ba65dcfdbfdc68db0c78 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 15/24] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 1d72d76c7a0d..b7c3712e50c8 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'musl-bootstrap'
 pkgname=musl-bootstrap
 version=1.1.24
-revision=3
+revision=4
 archs="~*-musl"
 wrksrc="musl-${version}"
 build_style=configure
@@ -15,6 +15,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From 33d2641598961f3f32a35bd4466ba1cfae23abfb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 16/24] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 5e0ea14048f4..94a24277d86c 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'rust-bootstrap'
 pkgname=rust-bootstrap
 version=1.63.0
-revision=1
+revision=2
 create_wrksrc=yes
 short_desc="Rust programming language bootstrap toolchain"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From 4c661db6336a1a0dfd1d36c3d01101115ff24567 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/24] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index ed268cb80004..e5266949e697 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -6,7 +6,7 @@ _icedtea_ver=2.6.18
 _bootstrap_jdk_home="/usr/lib/jvm/java-1.5-gcj"
 _final_jdk_home="/usr/lib/jvm/java-1.7-openjdk"
 version=7u221b02
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc=icedtea-${_icedtea_ver}
 build_style=gnu-configure
@@ -31,6 +31,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From 1b0c8e7514f1da6780fc466ed3fc59e67d392849 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 18/24] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 801f49142621..2ab68125c08b 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -2,7 +2,7 @@
 _final_jdk_home="usr/lib/jvm/java-9-openjdk"
 pkgname=openjdk9-bootstrap
 version=9.0.4p12
-revision=2
+revision=3
 _repo_ver=${version/p/+}
 archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk9u-jdk-${_repo_ver}"
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From bedc6791defb232c45cba3b39c1efecadf545990 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/24] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index c61d33c697e8..cfe59813340c 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -2,7 +2,7 @@
 _final_jdk_home="usr/lib/jvm/java-10-openjdk"
 pkgname=openjdk10-bootstrap
 version=10.0.2p13
-revision=2
+revision=3
 _repo_ver=${version/p/+}
 archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk10u-jdk-${_repo_ver}"
@@ -35,6 +35,7 @@ homepage="http://openjdk.java.net/"
 distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver}.tar.bz2"
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 2414ff3f8fd978f98f33a7c17e34c5d11ca7b3c9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 20/24] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 30c642e56e8d..c7a88ebe56a9 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk12-bootstrap'
 pkgname=openjdk12-bootstrap
 version=12.0.2+10
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
@@ -44,6 +44,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From beb39c7af2e2152b985dc0a728a66d491574d87a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/24] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index c1b211db7a39..d6cc830377f7 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk13-bootstrap'
 pkgname=openjdk13-bootstrap
 version=13.0.2+8
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
@@ -44,6 +44,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 0379ae666a77e1e1cd4cfb3254278b3d72c9bbdd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 22/24] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 9c66619f38e6..84e5f582f206 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk14-bootstrap'
 pkgname=openjdk14-bootstrap
 version=14.0.2+12
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
@@ -43,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 7a301b12a03aeb9534c3963711f870443008f10e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/24] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..dfb580a49841 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk15-bootstrap'
 pkgname=openjdk15-bootstrap
 version=15.0.3+3
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
@@ -46,6 +46,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 128514b02752011b44dc004ce0bfb672cde1b94a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 24/24] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..9a145bee4933 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk16-bootstrap'
 pkgname=openjdk16-bootstrap
 version=16.0.2+7
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
@@ -46,6 +46,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
@ 2022-10-10 18:33 ` ahesford
  2022-10-10 23:18 ` [PR PATCH] [Updated] " classabbyamp
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2022-10-10 18:33 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/39868#issuecomment-1273678707

Comment:
I like the idea of a separate bootstrap repo.

Even better would be a `void-packges` hierarchy that defines destination repositories instead of a `repository` template argument. For example: move all `repository=nonfree` templates under `nonfree` rather than `srcpkgs`, move the new `repository=bootstrap` templates under `bootstrap`, and we could even do away with `restricted` by creating a `restricted` hierarchy.

All of this is out of scope for this proposal, but I can dream.

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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
  2022-10-10 18:33 ` ahesford
@ 2022-10-10 23:18 ` classabbyamp
  2022-10-11  3:46 ` classabbyamp
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2022-10-10 23:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 25144 bytes --]

From d2873ff5dc00785f477d40925aba49743eb074c6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/24] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..f54ce4a01e5c 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -2,3 +2,4 @@
 # x86_64/glibc local repositories
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
+repository=/host/binpkgs/multilib/bootstrap
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..d1ac2b86ebdc 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -3,3 +3,4 @@
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
+repository=/host/binpkgs/bootstrap
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..c31896136289 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..c31896136289 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..a26ee1721ced 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..3cf76ab915fc 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..55929049e86c 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug
+repository=https://repo-default.voidlinux.org/current/bootstrap

From 73e2a7ba89dc6a6fe2ac71f2fb317c9ca770878a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/24] common/xbps-src/shutils/: add bootstrap repo

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

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index b0c39b2b7398..2e6beedf549a 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -R "${XBPS_REPOSITORY}/bootstrap" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree --repository=$XBPS_REPOSITORY/bootstrap -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a7100d4ea56f..b898955cc414 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -213,11 +213,13 @@ chroot_sync_repodata() {
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
+            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap"; \
             ) > $confdir/00-repository-alt-local.conf
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
             ( \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
+                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap"; \
             ) >> $confdir/00-repository-alt-local.conf
         fi
     else

From 40996f23c333d438ceab8700c2df41ae5b38e58a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/24] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..70309af4a3fe 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree" "--repository=${binpkgs}/bootstrap")
 rv=0
 
 template_exists() {

From c8c13f375b9a768e6fe0a356eea99f60fa605591 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/24] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 1 +
 common/travis/xpkgdiff.sh      | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..e7319b8d441a 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree
+ --repository=$HOME/hostdir/binpkgs/bootstrap"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..2fbae7e94006 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -9,6 +9,7 @@ while read -r pkg; do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
 		xbps-query --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
+				   --repository=$HOME/hostdir/binpkgs/bootstrap \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
 	done
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 7caabe4b0b71..a2eb9b7b166c 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -11,6 +11,7 @@ while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		if xbps-query --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  --repository=$HOME/hostdir/binpkgs/bootstrap \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
 			xpkgdiff $ARGS -f $subpkg

From 9500ee7871b0f130e15dffd02d3a63c10d4aa7ff Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/24] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index e122099fabcb..bd7d385d426c 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -16,6 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 3ea97ce18ad5be84b9d4b14c8ed2fe94d8655731 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/24] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index bb4e61983990..f07bdbc85fd7 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From a371a2e51b79a8ce2c9114fd1be4b9a522641c8c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/24] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index c6d5e7441b5d..5f8d18eead92 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -11,6 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 34fc10e833eda9474fe7ef7698664b196244c37e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/24] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 854ec7c2a168..35682f4e9d7f 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From e7133dfd00bb09c25dc2e377c81914f47dd5df88 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/24] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 468249d87ebc..83997aacf3de 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -15,6 +15,7 @@ checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From c1170ae4feae0b07d57827bddbe0e624d92128c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/24] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index a4ff6337ba1a..247ac4ea1e22 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -21,6 +21,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From 1ef5753813da175b418cc2fba5aa6a07b61db6db Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/24] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index eb8c4204a6cd..89ed03a2c63b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -87,6 +87,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From eac66a56a9008958ec9e2ef7853e2d2c7996acc3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/24] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 43d0b0049b5a..4d61cbd58340 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From 09eb4e93b6a9a974b414bfe4b52994ce0791cb13 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 13/24] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From 2d267fd6b99747095f19019cc811739b2b9f25c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/24] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 977357eaf312..c6b171f7e7b7 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -12,6 +12,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From aa2b52cf59ea1c48cc56eb4b866d7b43882aba90 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 15/24] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 1d72d76c7a0d..393d01d3a876 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -15,6 +15,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From c7f2ff52c90e24d86395e5ee5f38db30d2bf1e95 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 16/24] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 5e0ea14048f4..ca88a7eeb55e 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From c240e7637d6c847b8dbb6d1f4d01b54ccaf41538 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/24] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index ed268cb80004..ef3fec3cba8a 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -31,6 +31,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From af9f2d5a393590cccaab9bd47ba4b6c4a323052d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 18/24] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 801f49142621..96c5a71831b0 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From 8a50e80a7b565e172fd8ed238b9a1b297d95f6f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/24] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index c61d33c697e8..7b4b24b7fe99 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -35,6 +35,7 @@ homepage="http://openjdk.java.net/"
 distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver}.tar.bz2"
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 40c4f5436460aa072f99f0faba49bc26d0d5dd8f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 20/24] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 30c642e56e8d..9ffaa00bb573 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -44,6 +44,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From badfc87aee51bc3ed4c923f97e27788081f66967 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/24] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index c1b211db7a39..80fbbb260263 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -44,6 +44,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 92b675b5328c5e4e0b4ec1be73803a8ec1395c17 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 22/24] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 9c66619f38e6..2c3da2b23423 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -43,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 18175bec9b224249c1f4b6abae2840b13a1b565f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/24] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..74fe03b5760f 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -46,6 +46,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 3c9a7ef2e39ad0f6742b43b8a7fc33f4fa426065 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 24/24] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..dd419c954044 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -46,6 +46,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
  2022-10-10 18:33 ` ahesford
  2022-10-10 23:18 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-10-11  3:46 ` classabbyamp
  2022-10-11  3:54 ` [PR REVIEW] " sgn
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2022-10-11  3:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 25652 bytes --]

From 7d925827212112efe718f8c6ce1fdcad33dc1892 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/24] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
 # DON'T EDIT THIS FILE
 # x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
 # DON'T EDIT THIS FILE
 # Local repositories
+repository=/host/binpkgs/bootstrap
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug

From b1773de51d0a918f60a4c28c848d4e549976b1a5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/24] common/xbps-src/shutils/: add bootstrap repo

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

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index b0c39b2b7398..8e0ff5714a2d 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a7100d4ea56f..5063e6eba317 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -210,12 +210,14 @@ chroot_sync_repodata() {
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
         ( \
+            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
             ) > $confdir/00-repository-alt-local.conf
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
             ( \
+                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap"; \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
             ) >> $confdir/00-repository-alt-local.conf

From 2f6852af53625d11dcd1a7c6ab797b8a671431cf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/24] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
 rv=0
 
 template_exists() {

From f4d99bb233e5ea209cea052867a425baacfacaaf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/24] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 3 ++-
 common/travis/xpkgdiff.sh      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		xbps-query --repository=$HOME/hostdir/binpkgs \
+		xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+				   --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 7caabe4b0b71..4c00b12b8f0d 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if xbps-query --repository=$HOME/hostdir/binpkgs \
+		if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+					  --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"

From 4181b45487d91182073e10bdd817833664c17d99 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/24] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index e122099fabcb..bd7d385d426c 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -16,6 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From c52830928f1456ccd03aa6fe6cd3a8410fcdddd9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/24] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index bb4e61983990..f07bdbc85fd7 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From f7555d5c79fd86f7b509065122b5ef282af9169f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/24] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index c6d5e7441b5d..5f8d18eead92 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -11,6 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 6ac9a52bf642858283b29fc7e039894559900f57 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/24] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 854ec7c2a168..35682f4e9d7f 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From 42a9b5963351dc77d3c865d3bd32d36d4387bff2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/24] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 468249d87ebc..83997aacf3de 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -15,6 +15,7 @@ checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 719b9d99a33f9b14ce842be0cb90028c1ec6b755 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/24] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index a4ff6337ba1a..247ac4ea1e22 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -21,6 +21,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From a58a53320ef94dec755366add6d35acf17de2e2a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/24] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index eb8c4204a6cd..89ed03a2c63b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -87,6 +87,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From 872a2c51485814a4ffc8367febc0a4f1fd383cd8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/24] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 43d0b0049b5a..4d61cbd58340 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From 493a888570e5f60ee0b2178b616bef1dd3a344d7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 13/24] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From 20ef5f5f0a13f893473e5ca24bb18e8301aab0d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/24] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 977357eaf312..c6b171f7e7b7 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -12,6 +12,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From 354e2a9ca590a769d73347cc2afbd45b35fe2bcb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 15/24] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 1d72d76c7a0d..393d01d3a876 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -15,6 +15,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From 485eef97d7ab82c462aad1836545feb22ace35a9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 16/24] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 5e0ea14048f4..ca88a7eeb55e 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From 6b112891333cdb2a26683bf413fee7e84e6f0f47 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/24] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index ed268cb80004..ef3fec3cba8a 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -31,6 +31,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From 1e6b7cc5235be17a794603c58905a5a118d10e0e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 18/24] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 801f49142621..96c5a71831b0 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From 192ce8ef988cda8b125e26b0475e75b79f85e891 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/24] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index c61d33c697e8..7b4b24b7fe99 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -35,6 +35,7 @@ homepage="http://openjdk.java.net/"
 distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver}.tar.bz2"
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 417354ebb86b292a5243225da96bbb4f78d2a618 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 20/24] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 30c642e56e8d..9ffaa00bb573 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -44,6 +44,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 70e36db6cb27fd92a37389563e3f7283c04bd83f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/24] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index c1b211db7a39..80fbbb260263 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -44,6 +44,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 9249a8fd441c52673f0754737ccd9193edee838a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 22/24] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 9c66619f38e6..2c3da2b23423 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -43,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 55db62beb08853a96a4b528b66fc911403ed7ed0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/24] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..74fe03b5760f 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -46,6 +46,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From a0143dacc673e2b5ed29114dd11b1fedf761dd55 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 24/24] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..dd419c954044 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -46,6 +46,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [PR REVIEW] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (2 preceding siblings ...)
  2022-10-11  3:46 ` classabbyamp
@ 2022-10-11  3:54 ` sgn
  2022-10-11  4:11 ` [PR PATCH] [Updated] " classabbyamp
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2022-10-11  3:54 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39868#discussion_r991790286

Comment:
While we're at it, can we change this to heredoc? subshell is not necessary, I think

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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (3 preceding siblings ...)
  2022-10-11  3:54 ` [PR REVIEW] " sgn
@ 2022-10-11  4:11 ` classabbyamp
  2022-11-20  0:14 ` classabbyamp
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2022-10-11  4:11 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 26202 bytes --]

From 7d925827212112efe718f8c6ce1fdcad33dc1892 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/24] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
 # DON'T EDIT THIS FILE
 # x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
 # DON'T EDIT THIS FILE
 # Local repositories
+repository=/host/binpkgs/bootstrap
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug

From 5ee890d559402d3ed59a6bf031986c45f8a99ca3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/24] common/xbps-src/shutils/: add bootstrap repo

---
 common/xbps-src/shutils/bulk.sh   |  4 ++--
 common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index b0c39b2b7398..8e0ff5714a2d 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a7100d4ea56f..c5c224ee4c51 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -209,16 +209,18 @@ chroot_sync_repodata() {
     # Update xbps alternative repository if set.
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
-        ( \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
-            ) > $confdir/00-repository-alt-local.conf
+        cat <<- ! > $confdir/00-repository-alt-local.conf
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+		!
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
-            ( \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
-            ) >> $confdir/00-repository-alt-local.conf
+            cat <<- ! >> $confdir/00-repository-alt-local.conf
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+			!
         fi
     else
         rm -f $confdir/00-repository-alt-local.conf

From d6a30d6090d8ca71206af587b2c83f1deca27ad1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/24] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
 rv=0
 
 template_exists() {

From 8ade2e225f33a1736b1e3221184498dd72701208 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/24] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 3 ++-
 common/travis/xpkgdiff.sh      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		xbps-query --repository=$HOME/hostdir/binpkgs \
+		xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+				   --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 7caabe4b0b71..4c00b12b8f0d 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if xbps-query --repository=$HOME/hostdir/binpkgs \
+		if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+					  --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"

From 70354321e8ec3b537d09aad916838e0ab582389c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/24] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index e122099fabcb..bd7d385d426c 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -16,6 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 5f5013b8fc0c39da6a3327d428da34da212ad29a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/24] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index bb4e61983990..f07bdbc85fd7 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From 16ed4b3084d11232f550805e80d283b5f22d0119 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/24] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index c6d5e7441b5d..5f8d18eead92 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -11,6 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 8f767172a1407f0a5ec6981667a4890356e06280 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/24] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 854ec7c2a168..35682f4e9d7f 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From 6a06ab9a05cdced1349ded79f9448f235d175c3b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/24] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 468249d87ebc..83997aacf3de 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -15,6 +15,7 @@ checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From f3ae54b4aa3ce5e001879c7a9dc6cca417ff0aaf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/24] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index a4ff6337ba1a..247ac4ea1e22 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -21,6 +21,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From 91f9a209c1c8bc614f71e11b1bb0f011eb2b3a65 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/24] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index eb8c4204a6cd..89ed03a2c63b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -87,6 +87,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From bc7bb2430abaca8f985ce885fae8e2b0ecad45f2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/24] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 43d0b0049b5a..4d61cbd58340 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From 72e57ea99e507efb8412a10ef984eebf7acf5677 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 13/24] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From 898836ef6f8fffb29ae932bcf59c1873ab8d9e65 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/24] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 977357eaf312..c6b171f7e7b7 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -12,6 +12,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From a7032d23d1282d321f5f4cf3c1a14fe753cde5ca Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 15/24] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 1d72d76c7a0d..393d01d3a876 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -15,6 +15,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From ebc8b9f825be00209f278bc240610c9583bfd384 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 16/24] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 5e0ea14048f4..ca88a7eeb55e 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From 2435bc8892e4b0b021968c0a89af6a9e4cde9b7b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/24] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index ed268cb80004..ef3fec3cba8a 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -31,6 +31,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From d978f388ba6fd06ec4598324f6446f44278174eb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 18/24] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 801f49142621..96c5a71831b0 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From e43aeef1d6416881cb64590bb9c9cba97b4e2b78 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/24] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index c61d33c697e8..7b4b24b7fe99 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -35,6 +35,7 @@ homepage="http://openjdk.java.net/"
 distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver}.tar.bz2"
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 7e45d258718855e15a706979b6ea211f63745ad9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 20/24] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 30c642e56e8d..9ffaa00bb573 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -44,6 +44,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 260912642b5b839f4596171f6ce46e7c7c45791d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/24] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index c1b211db7a39..80fbbb260263 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -44,6 +44,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 64e10bf748882a7e29055045402997ec4af23840 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 22/24] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 9c66619f38e6..2c3da2b23423 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -43,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 38ad3ec97c82092150c4139118382cd16c981a2c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/24] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..74fe03b5760f 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -46,6 +46,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 2808dff9e425d859f4b406bcddb231c48fa20a01 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 24/24] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..dd419c954044 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -46,6 +46,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (4 preceding siblings ...)
  2022-10-11  4:11 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-11-20  0:14 ` classabbyamp
  2022-11-20  1:45 ` classabbyamp
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2022-11-20  0:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 27191 bytes --]

From 32ad0c5e5c538c2ebe34dc5dcd517b88a7fcfbaa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/25] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
 # DON'T EDIT THIS FILE
 # x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
 # DON'T EDIT THIS FILE
 # Local repositories
+repository=/host/binpkgs/bootstrap
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug

From bfe16ced48c38985a6ad87a2f6f85cc5367cb788 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/25] common/xbps-src/shutils/: add bootstrap repo

---
 common/xbps-src/shutils/bulk.sh   |  4 ++--
 common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a1..69e36f4a43f4 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a7100d4ea56f..c5c224ee4c51 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -209,16 +209,18 @@ chroot_sync_repodata() {
     # Update xbps alternative repository if set.
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
-        ( \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
-            ) > $confdir/00-repository-alt-local.conf
+        cat <<- ! > $confdir/00-repository-alt-local.conf
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+		!
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
-            ( \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
-            ) >> $confdir/00-repository-alt-local.conf
+            cat <<- ! >> $confdir/00-repository-alt-local.conf
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+			!
         fi
     else
         rm -f $confdir/00-repository-alt-local.conf

From 4168be3f17bc9e044eb7ed5973c01a9d2d66fd7f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/25] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
 rv=0
 
 template_exists() {

From 8b51ac2ee8e1fc23b2e6cda46285560b6a14b5ab Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/25] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 3 ++-
 common/travis/xpkgdiff.sh      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		xbps-query --repository=$HOME/hostdir/binpkgs \
+		xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+				   --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 7caabe4b0b71..4c00b12b8f0d 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if xbps-query --repository=$HOME/hostdir/binpkgs \
+		if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+					  --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"

From b309e9b124123a0a214b4ffd0656bdc0675484cd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/25] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 90dcc3372d85..da448e2a57f8 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -15,6 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 94887332f2e8e33584fac533a65a7aa9047ff74a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/25] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 5e1609934f26..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From 76ce20f58127ab8307dba49a0fdbde5da4c64d10 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/25] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index 2bb65e0467ed..1217a9d982fa 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 997e54564652e21f357969b38f3b69dc587f5be0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/25] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 03d590fcabdd..650f30712d1d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=97ddf8ea58a2b9e0fbc2508e245028ca75911bd38d1551616b148c1aa5740ad9
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From ef83d7249af2f10c73f77e4ad1d32302cafb9af6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/25] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 6a99116d4b5d..6480b22c40a9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -14,6 +14,7 @@ checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 4ec9b7d900d924a9da9155de9c019a7ca600476e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/25] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index cdfd6ff49840..d03deda0344b 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -20,6 +20,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From 96bc23f3a0f5e26bb7814bad27dfb118dae002d2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/25] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 0e3de89c3b37..d5e76562fdc1 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -88,6 +88,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From d64a9c1c14fd1aa24efb6aa3601cc3153237eaf4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/25] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index de2b886baa10..4e39b797a035 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From 159597c16c8982994a458c76443649d0f67aa8f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 19 Nov 2022 19:10:32 -0500
Subject: [PATCH 13/25] cargo-auditable-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-auditable-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index ebde54c3e2d5..f58046a7c736 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -14,6 +14,7 @@ homepage="https://github.com/rust-secure-code/cargo-auditable"
 changelog="https://github.com/rust-secure-code/cargo-auditable/raw/master/cargo-auditable/CHANGELOG.md"
 distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
 checksum=8827a3810721e36df38dcdc28b2291760dc70609e57a9c7245ba1bf1932e1ced
+repository=bootstrap
 
 post_install() {
 	vlicense ../LICENSE-MIT

From a26f12234cd4ac408abfa83b02a1ed1305c5a247 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/25] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From b883351e4bd412b52dc5fa1aa49089946cbc10ef Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 15/25] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 222baa991a2e..304d2053d041 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -11,6 +11,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From 3c675a048890c8e4292cda16e5980d21b2c7ad1c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 16/25] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 774fdad86397..6e04a4bc9e1c 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -14,6 +14,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From 2c95cfe5c67912ea172ead07db202157f1436767 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/25] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 1fe6f1dee75a..23f147c9fcb9 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From 9cf17807de145a78a38c1a66bc36bed2f01dc284 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 18/25] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 53dc975a16da..cba1b589f699 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -33,6 +33,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
 make_check=no # requires full jdk build
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From 1f2a7f0c8b9dd6ba5da7be39cfd64233bd7929e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/25] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index d42b6ea3874a..6d85e3e6f17d 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From ccea931e20c0a7ce75b7d862bb6e082961416c54 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 20/25] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c8c621147b6..4776e4b19047 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -34,6 +34,7 @@ homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-${_repo_ver}.tar.gz"
 checksum="39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From e4f127bb1cb04662692c96429b7d00a836ce67a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/25] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index c09ed20d2d04..3bbc2c6967e7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -43,6 +43,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From f69c18c7a3da13f18c867d3f80b561d20aef5042 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 22/25] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 34e901afd839..89b59cfc6f84 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -43,6 +43,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 3380df763244034aedca4b10c93428b3eaa15efe Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/25] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index e58d4448491f..b20333bb85b4 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -42,6 +42,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 3900a9ebcb8a60213499e8eb40b1053c10dd6477 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 24/25] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 62f2626c0d53..a3b515b98a96 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -47,6 +47,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From b598323b62e7a58ca347490b83ab8af7d9c34450 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 25/25] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index e4d09511cee9..b73b590b0b01 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -47,6 +47,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (5 preceding siblings ...)
  2022-11-20  0:14 ` classabbyamp
@ 2022-11-20  1:45 ` classabbyamp
  2023-01-25 17:26 ` [PR PATCH] [Updated] " classabbyamp
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2022-11-20  1:45 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39868#issuecomment-1321011143

Comment:
here's a list of all files from bootstrap/chroot packages on the repos: [bootstrap-files.txt](https://github.com/void-linux/void-packages/files/10048259/bootstrap-files.txt)

[generated with](https://github.com/classabbyamp/xX_tools_Xx/blob/tools/xrls) `xrls chroot-bash chroot-distcc chroot-gawk chroot-git chroot-grep chroot-util-linux chroot-curl cargo-bootstrap cargo-auditable-bootstrap dmd-bootstrap go1.12-bootstrap musl-bootstrap rust-bootstrap openjdk7-bootstrap openjdk9-bootstrap openjdk10-bootstrap openjdk12-bootstrap openjdk13-bootstrap openjdk14-bootstrap openjdk15-bootstrap openjdk16-bootstrap`


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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (6 preceding siblings ...)
  2022-11-20  1:45 ` classabbyamp
@ 2023-01-25 17:26 ` classabbyamp
  2023-01-25 17:48 ` classabbyamp
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-01-25 17:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 27191 bytes --]

From 0e7f9f9d3e46a9ab4f440dc10ea97e408637707d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/25] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
 # DON'T EDIT THIS FILE
 # x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
 # DON'T EDIT THIS FILE
 # Local repositories
+repository=/host/binpkgs/bootstrap
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug

From b1bdc775e3945f0c91c44a4c4528eaa76f665ef0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/25] common/xbps-src/shutils/: add bootstrap repo

---
 common/xbps-src/shutils/bulk.sh   |  4 ++--
 common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a1..69e36f4a43f4 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b8cb25523724..d65d8d7e3074 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -214,16 +214,18 @@ chroot_sync_repodata() {
     # Update xbps alternative repository if set.
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
-        ( \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
-            ) > $confdir/00-repository-alt-local.conf
+        cat <<- ! > $confdir/00-repository-alt-local.conf
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+		!
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
-            ( \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
-            ) >> $confdir/00-repository-alt-local.conf
+            cat <<- ! >> $confdir/00-repository-alt-local.conf
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+			!
         fi
     else
         rm -f $confdir/00-repository-alt-local.conf

From 0a3022fa4b46f142c9f2af2ad2db8902837d0065 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/25] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
 rv=0
 
 template_exists() {

From 8a3efc7619e75e607783ac3c8cfd291748acec08 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/25] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 3 ++-
 common/travis/xpkgdiff.sh      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		xbps-query --repository=$HOME/hostdir/binpkgs \
+		xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+				   --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 6450a6c0889b..ce042c1628bf 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if xbps-query --repository=$HOME/hostdir/binpkgs \
+		if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+					  --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"

From 4afb4ca4d4dc22ce06d442db7cd35e819aba38a6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/25] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 90dcc3372d85..da448e2a57f8 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -15,6 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 0f0878bdc18b92112a3687f64142ace8341284d3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/25] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 5e1609934f26..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From 821cf6cd0a3be0b9ed71e26eb27bfd683cb3a0d4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/25] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index 2bb65e0467ed..1217a9d982fa 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 1b2d489ef3468cb67f42c0de730905ff03d9d66b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/25] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index b7641aa34392..8e0e0db7b291 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From 05fb54ae2e768fd28dc7fe94c40880834981f572 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/25] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 7b68ca9348b8..fe26cf1f17f9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -14,6 +14,7 @@ checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 15f0f44c1df54082b8b7f0b57592241b5e044688 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/25] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index cdfd6ff49840..d03deda0344b 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -20,6 +20,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From 8fdda2f812e43fa4c19c06fcf85a5490e76ee932 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/25] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 5442ecfaca4c..6f70942f8838 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -88,6 +88,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From e985bcdc60e67c02ff9c2035f21e26d1a0e1c5d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/25] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index de2b886baa10..4e39b797a035 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From c51c20c70ee47853d860608053e8b02541fc5472 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 19 Nov 2022 19:10:32 -0500
Subject: [PATCH 13/25] cargo-auditable-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-auditable-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index a7fa067c56ea..4efd32137b91 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -14,6 +14,7 @@ homepage="https://github.com/rust-secure-code/cargo-auditable"
 changelog="https://github.com/rust-secure-code/cargo-auditable/raw/master/cargo-auditable/CHANGELOG.md"
 distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
 checksum=1e04922614623ab0fc641ca6b0fc5ab04c91845b19efbace034e161a0e120b33
+repository=bootstrap
 
 post_install() {
 	vlicense ../LICENSE-MIT

From de51eb01003ef0338b00acca983cd53b3dc7a22e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/25] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From 27abc392cae0fcf6d45b6d3eaafcd4e672318733 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 15/25] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 222baa991a2e..304d2053d041 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -11,6 +11,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From 684502585f471a7f11cb8e014bb5232f255253ce Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 16/25] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 774fdad86397..6e04a4bc9e1c 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -14,6 +14,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From f273104da0c4ff6466d5298a6f992595570dd768 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/25] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 1fe6f1dee75a..23f147c9fcb9 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From 4d8201c1775b429a6b81f8fdd6483ed3bbf5c8e2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 18/25] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 53dc975a16da..cba1b589f699 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -33,6 +33,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
 make_check=no # requires full jdk build
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From d066c8b21397c0fac243e073fdbc7fd84d449bef Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/25] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index d42b6ea3874a..6d85e3e6f17d 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From 3140b84bcfc709b340a2046ec9b591e639dd5979 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 20/25] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c8c621147b6..4776e4b19047 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -34,6 +34,7 @@ homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-${_repo_ver}.tar.gz"
 checksum="39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From f3c0daf2384ef4f838a2d4a1f311661c1fb6a765 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/25] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index c09ed20d2d04..3bbc2c6967e7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -43,6 +43,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 18fbf922b919ccc9a43af5c6f453722e53c83637 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 22/25] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 34e901afd839..89b59cfc6f84 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -43,6 +43,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 2950ca1e1e123f40843ced905ac5e90253600a87 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/25] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index e58d4448491f..b20333bb85b4 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -42,6 +42,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 628aadfd653abf2c70fba2a191e72f9f456b3eb9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 24/25] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 62f2626c0d53..a3b515b98a96 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -47,6 +47,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From d87ffc939ab53c62451ca47e2087280d90651020 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 25/25] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index e4d09511cee9..b73b590b0b01 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -47,6 +47,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (7 preceding siblings ...)
  2023-01-25 17:26 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-01-25 17:48 ` classabbyamp
  2023-01-25 18:14 ` [PR PATCH] [Updated] " classabbyamp
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-01-25 17:48 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39868#issuecomment-1404003925

Comment:
files to be removed from repos (old, removed bootstrap packages): [rm-files.txt](https://github.com/void-linux/void-packages/files/10502020/rm-files.txt)

files to be moved to their respective bootstrap repos (`/current{,/bootstrap}`, `/current/aarch64{,/bootstrap}`, `/current/multilib{,/bootstrap}`, `/current/musl{,/bootstrap}`): [bootstrap-files.txt](https://github.com/void-linux/void-packages/files/10502132/bootstrap-files.txt)



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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (8 preceding siblings ...)
  2023-01-25 17:48 ` classabbyamp
@ 2023-01-25 18:14 ` classabbyamp
  2023-02-03 20:13 ` classabbyamp
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-01-25 18:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 26392 bytes --]

From 0e7f9f9d3e46a9ab4f440dc10ea97e408637707d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/24] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
 # DON'T EDIT THIS FILE
 # x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
 # DON'T EDIT THIS FILE
 # Local repositories
+repository=/host/binpkgs/bootstrap
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug

From b1bdc775e3945f0c91c44a4c4528eaa76f665ef0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/24] common/xbps-src/shutils/: add bootstrap repo

---
 common/xbps-src/shutils/bulk.sh   |  4 ++--
 common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a1..69e36f4a43f4 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b8cb25523724..d65d8d7e3074 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -214,16 +214,18 @@ chroot_sync_repodata() {
     # Update xbps alternative repository if set.
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
-        ( \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
-            ) > $confdir/00-repository-alt-local.conf
+        cat <<- ! > $confdir/00-repository-alt-local.conf
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+		!
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
-            ( \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
-            ) >> $confdir/00-repository-alt-local.conf
+            cat <<- ! >> $confdir/00-repository-alt-local.conf
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+			!
         fi
     else
         rm -f $confdir/00-repository-alt-local.conf

From 0a3022fa4b46f142c9f2af2ad2db8902837d0065 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/24] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
 rv=0
 
 template_exists() {

From 8a3efc7619e75e607783ac3c8cfd291748acec08 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/24] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 3 ++-
 common/travis/xpkgdiff.sh      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		xbps-query --repository=$HOME/hostdir/binpkgs \
+		xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+				   --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 6450a6c0889b..ce042c1628bf 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if xbps-query --repository=$HOME/hostdir/binpkgs \
+		if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+					  --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"

From 4afb4ca4d4dc22ce06d442db7cd35e819aba38a6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/24] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 90dcc3372d85..da448e2a57f8 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -15,6 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 0f0878bdc18b92112a3687f64142ace8341284d3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/24] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 5e1609934f26..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From 821cf6cd0a3be0b9ed71e26eb27bfd683cb3a0d4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/24] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index 2bb65e0467ed..1217a9d982fa 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 1b2d489ef3468cb67f42c0de730905ff03d9d66b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/24] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index b7641aa34392..8e0e0db7b291 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From 05fb54ae2e768fd28dc7fe94c40880834981f572 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/24] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 7b68ca9348b8..fe26cf1f17f9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -14,6 +14,7 @@ checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 15f0f44c1df54082b8b7f0b57592241b5e044688 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/24] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index cdfd6ff49840..d03deda0344b 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -20,6 +20,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From 8fdda2f812e43fa4c19c06fcf85a5490e76ee932 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/24] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 5442ecfaca4c..6f70942f8838 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -88,6 +88,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From e985bcdc60e67c02ff9c2035f21e26d1a0e1c5d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/24] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index de2b886baa10..4e39b797a035 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From c51c20c70ee47853d860608053e8b02541fc5472 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 19 Nov 2022 19:10:32 -0500
Subject: [PATCH 13/24] cargo-auditable-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-auditable-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index a7fa067c56ea..4efd32137b91 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -14,6 +14,7 @@ homepage="https://github.com/rust-secure-code/cargo-auditable"
 changelog="https://github.com/rust-secure-code/cargo-auditable/raw/master/cargo-auditable/CHANGELOG.md"
 distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
 checksum=1e04922614623ab0fc641ca6b0fc5ab04c91845b19efbace034e161a0e120b33
+repository=bootstrap
 
 post_install() {
 	vlicense ../LICENSE-MIT

From de51eb01003ef0338b00acca983cd53b3dc7a22e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/24] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From 27abc392cae0fcf6d45b6d3eaafcd4e672318733 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 15/24] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 222baa991a2e..304d2053d041 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -11,6 +11,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From 21cc8558c78610f301ad31d16e83c32d8c828cc7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 16/24] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 1fe6f1dee75a..23f147c9fcb9 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From c106dd0f7b57335500b1fdffc51299c62e5bde05 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/24] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 53dc975a16da..cba1b589f699 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -33,6 +33,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
 make_check=no # requires full jdk build
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From e928227de71bdbb63dc65366d71c90aa5d3f7505 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 18/24] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index d42b6ea3874a..6d85e3e6f17d 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From ffde537515114e98ea5d6fd5fa85b5b37b66aa44 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/24] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c8c621147b6..4776e4b19047 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -34,6 +34,7 @@ homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-${_repo_ver}.tar.gz"
 checksum="39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 7547ef2741bd7a56f44537d88003b6fca3504309 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 20/24] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index c09ed20d2d04..3bbc2c6967e7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -43,6 +43,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 835026481dcdca3d398f0cf9032ac705943610a3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/24] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 34e901afd839..89b59cfc6f84 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -43,6 +43,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 2f2339a23cf8462fad2561c1d65c13266ab21cc4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 22/24] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index e58d4448491f..b20333bb85b4 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -42,6 +42,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 29110ea9c08d0071b09eb75209a82d2e9e34f67a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/24] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 62f2626c0d53..a3b515b98a96 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -47,6 +47,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From d65b9545afa1daa775db67e6ec5308d5eb9ee0b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 24/24] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index e4d09511cee9..b73b590b0b01 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -47,6 +47,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (9 preceding siblings ...)
  2023-01-25 18:14 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-02-03 20:13 ` classabbyamp
  2023-02-03 20:14 ` classabbyamp
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-02-03 20:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 27191 bytes --]

From c02e4990d3f03fb8f22c56f78e1d98c45c53503f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/25] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
 # DON'T EDIT THIS FILE
 # x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
 # DON'T EDIT THIS FILE
 # Local repositories
+repository=/host/binpkgs/bootstrap
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug

From fd166971ce78a2379bb50a95b244851b36bea599 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/25] common/xbps-src/shutils/: add bootstrap repo

---
 common/xbps-src/shutils/bulk.sh   |  4 ++--
 common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a1..69e36f4a43f4 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b8cb25523724..d65d8d7e3074 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -214,16 +214,18 @@ chroot_sync_repodata() {
     # Update xbps alternative repository if set.
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
-        ( \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
-            ) > $confdir/00-repository-alt-local.conf
+        cat <<- ! > $confdir/00-repository-alt-local.conf
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+		!
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
-            ( \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
-            ) >> $confdir/00-repository-alt-local.conf
+            cat <<- ! >> $confdir/00-repository-alt-local.conf
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+			!
         fi
     else
         rm -f $confdir/00-repository-alt-local.conf

From 9c24408833ccbe7443b94c6c5d4f116d6c8bb8fe Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/25] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
 rv=0
 
 template_exists() {

From 84e860fc5458d9a0ffbda5ce180ec00f8da3b031 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/25] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 3 ++-
 common/travis/xpkgdiff.sh      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		xbps-query --repository=$HOME/hostdir/binpkgs \
+		xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+				   --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 6450a6c0889b..ce042c1628bf 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if xbps-query --repository=$HOME/hostdir/binpkgs \
+		if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+					  --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"

From b0b3887cdc81fee54905f57e99880fc1d51d586d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/25] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 90dcc3372d85..da448e2a57f8 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -15,6 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 08b64b1af0d0dd55b2525f20a998d9db8a78345e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/25] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 5e1609934f26..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From 917a8c2e0e5042f1dadead5a11856010d8adf00c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/25] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index 2bb65e0467ed..1217a9d982fa 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 4780a60af20e0c9e75118f2befcf16f9b4021c3a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/25] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index b7641aa34392..8e0e0db7b291 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From f2f55a6e8fb40e755890dfe8dc659798c27e0b08 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/25] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 7b68ca9348b8..fe26cf1f17f9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -14,6 +14,7 @@ checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From a30c86c1ab776f383ffca17839e18ff72422f223 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/25] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index cdfd6ff49840..d03deda0344b 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -20,6 +20,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From b61ed891e4c574a7aca132cea42142309258ebc3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/25] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 5442ecfaca4c..6f70942f8838 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -88,6 +88,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From 94d9cc39be0a341fac4e9dc4942c491fe72e3a02 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/25] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index de2b886baa10..4e39b797a035 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From cb6c808672dd6a0adc2462a99aa3ad64e44c4cf5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 19 Nov 2022 19:10:32 -0500
Subject: [PATCH 13/25] cargo-auditable-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-auditable-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index a7fa067c56ea..4efd32137b91 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -14,6 +14,7 @@ homepage="https://github.com/rust-secure-code/cargo-auditable"
 changelog="https://github.com/rust-secure-code/cargo-auditable/raw/master/cargo-auditable/CHANGELOG.md"
 distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
 checksum=1e04922614623ab0fc641ca6b0fc5ab04c91845b19efbace034e161a0e120b33
+repository=bootstrap
 
 post_install() {
 	vlicense ../LICENSE-MIT

From f103f21b1a343d0f89591d0a3acad3dcf60ec266 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/25] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From af39601c193d5dbf9a73baa7a01735d5323ceae7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 15/25] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 222baa991a2e..304d2053d041 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -11,6 +11,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From 2b99a9ca691c5b56a07c1ba4221869153e151c6d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 16/25] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 774fdad86397..6e04a4bc9e1c 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -14,6 +14,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From d199336e5784375ca2de25c66614355a70431b75 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/25] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 1fe6f1dee75a..23f147c9fcb9 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From 8ad0bd4714c5d50873427dff38af0e317d0213b9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 18/25] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 53dc975a16da..cba1b589f699 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -33,6 +33,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
 make_check=no # requires full jdk build
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From 5bedc10aaafc2c102f7e82535f6c98e8322fd50c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/25] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index d42b6ea3874a..6d85e3e6f17d 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From 29c62131d0d99b379221fb597f8dd636c3601a0f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 20/25] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c8c621147b6..4776e4b19047 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -34,6 +34,7 @@ homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-${_repo_ver}.tar.gz"
 checksum="39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 75a18adfd68b9bf2a620179b03b896aa98aa6c57 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/25] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index c09ed20d2d04..3bbc2c6967e7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -43,6 +43,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 960712fd5a1a985a67774bd43a0c822cbfbbca10 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 22/25] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 34e901afd839..89b59cfc6f84 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -43,6 +43,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 7712572f40b093bb46cb2062db1b774ec4361051 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/25] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index e58d4448491f..b20333bb85b4 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -42,6 +42,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From df85f27cbeccbe5025a200cc4f5715208249986b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 24/25] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 62f2626c0d53..a3b515b98a96 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -47,6 +47,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From b4d2efb234bfd62e1179f512217dc40f5d33c0af Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 25/25] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index e4d09511cee9..b73b590b0b01 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -47,6 +47,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (10 preceding siblings ...)
  2023-02-03 20:13 ` classabbyamp
@ 2023-02-03 20:14 ` classabbyamp
  2023-02-04  2:33 ` the-maldridge
  2023-02-04  2:33 ` [PR PATCH] [Closed]: " the-maldridge
  13 siblings, 0 replies; 15+ messages in thread
From: classabbyamp @ 2023-02-03 20:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 26392 bytes --]

From c02e4990d3f03fb8f22c56f78e1d98c45c53503f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/24] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
 # DON'T EDIT THIS FILE
 # x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
 # DON'T EDIT THIS FILE
 # Local repositories
+repository=/host/binpkgs/bootstrap
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
 # aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
 # voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug

From fd166971ce78a2379bb50a95b244851b36bea599 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/24] common/xbps-src/shutils/: add bootstrap repo

---
 common/xbps-src/shutils/bulk.sh   |  4 ++--
 common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a1..69e36f4a43f4 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b8cb25523724..d65d8d7e3074 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -214,16 +214,18 @@ chroot_sync_repodata() {
     # Update xbps alternative repository if set.
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
-        ( \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
-            ) > $confdir/00-repository-alt-local.conf
+        cat <<- ! > $confdir/00-repository-alt-local.conf
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+		!
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
-            ( \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
-            ) >> $confdir/00-repository-alt-local.conf
+            cat <<- ! >> $confdir/00-repository-alt-local.conf
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+			!
         fi
     else
         rm -f $confdir/00-repository-alt-local.conf

From 9c24408833ccbe7443b94c6c5d4f116d6c8bb8fe Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/24] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
 rv=0
 
 template_exists() {

From 84e860fc5458d9a0ffbda5ce180ec00f8da3b031 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/24] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 3 ++-
 common/travis/xpkgdiff.sh      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		xbps-query --repository=$HOME/hostdir/binpkgs \
+		xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+				   --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 6450a6c0889b..ce042c1628bf 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
-		if xbps-query --repository=$HOME/hostdir/binpkgs \
+		if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+					  --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"

From b0b3887cdc81fee54905f57e99880fc1d51d586d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/24] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 90dcc3372d85..da448e2a57f8 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -15,6 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 08b64b1af0d0dd55b2525f20a998d9db8a78345e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/24] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 5e1609934f26..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From 917a8c2e0e5042f1dadead5a11856010d8adf00c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/24] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index 2bb65e0467ed..1217a9d982fa 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 4780a60af20e0c9e75118f2befcf16f9b4021c3a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/24] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index b7641aa34392..8e0e0db7b291 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From f2f55a6e8fb40e755890dfe8dc659798c27e0b08 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/24] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 7b68ca9348b8..fe26cf1f17f9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -14,6 +14,7 @@ checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From a30c86c1ab776f383ffca17839e18ff72422f223 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/24] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index cdfd6ff49840..d03deda0344b 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -20,6 +20,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From b61ed891e4c574a7aca132cea42142309258ebc3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/24] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 5442ecfaca4c..6f70942f8838 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -88,6 +88,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From 94d9cc39be0a341fac4e9dc4942c491fe72e3a02 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/24] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index de2b886baa10..4e39b797a035 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From cb6c808672dd6a0adc2462a99aa3ad64e44c4cf5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 19 Nov 2022 19:10:32 -0500
Subject: [PATCH 13/24] cargo-auditable-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-auditable-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index a7fa067c56ea..4efd32137b91 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -14,6 +14,7 @@ homepage="https://github.com/rust-secure-code/cargo-auditable"
 changelog="https://github.com/rust-secure-code/cargo-auditable/raw/master/cargo-auditable/CHANGELOG.md"
 distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
 checksum=1e04922614623ab0fc641ca6b0fc5ab04c91845b19efbace034e161a0e120b33
+repository=bootstrap
 
 post_install() {
 	vlicense ../LICENSE-MIT

From f103f21b1a343d0f89591d0a3acad3dcf60ec266 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/24] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From af39601c193d5dbf9a73baa7a01735d5323ceae7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 15/24] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 222baa991a2e..304d2053d041 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -11,6 +11,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From a9779175334c0311114379f55454ab150deaadb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 16/24] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 1fe6f1dee75a..23f147c9fcb9 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From a6bd11163cda338a3d0ef4349eb59f7bb9795d37 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/24] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 53dc975a16da..cba1b589f699 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -33,6 +33,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
 make_check=no # requires full jdk build
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From f9ee4a7b46abc7a52d95a4d1a194e90b1e03ad92 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 18/24] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index d42b6ea3874a..6d85e3e6f17d 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From 4a7a847f1706582c8a10f4160acb8c97302da9f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/24] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c8c621147b6..4776e4b19047 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -34,6 +34,7 @@ homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-${_repo_ver}.tar.gz"
 checksum="39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From c5bcb651a88912c9c38f693564f8d1d84df17354 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 20/24] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index c09ed20d2d04..3bbc2c6967e7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -43,6 +43,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 78357a484c691bb6bdb1e56f0af1d95c8b4677cc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/24] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 34e901afd839..89b59cfc6f84 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -43,6 +43,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 1687eac20187a77143f77df6c8462263f5e65199 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 22/24] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index e58d4448491f..b20333bb85b4 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -42,6 +42,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 7daf898be0f64c85ea641005903f97b6a0385d5f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/24] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 62f2626c0d53..a3b515b98a96 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -47,6 +47,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 807fa7c7353cf199e2f357e7b8ed60749f97e385 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 24/24] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index e4d09511cee9..b73b590b0b01 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -47,6 +47,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

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

* Re: [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (11 preceding siblings ...)
  2023-02-03 20:14 ` classabbyamp
@ 2023-02-04  2:33 ` the-maldridge
  2023-02-04  2:33 ` [PR PATCH] [Closed]: " the-maldridge
  13 siblings, 0 replies; 15+ messages in thread
From: the-maldridge @ 2023-02-04  2:33 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/39868#issuecomment-1416635604

Comment:
github is being dumb, this was pushed by hand as a2c510b8a4

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

* Re: [PR PATCH] [Closed]: [RFC] move chroot/bootstrap packages to bootstrap repository
  2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
                   ` (12 preceding siblings ...)
  2023-02-04  2:33 ` the-maldridge
@ 2023-02-04  2:33 ` the-maldridge
  13 siblings, 0 replies; 15+ messages in thread
From: the-maldridge @ 2023-02-04  2:33 UTC (permalink / raw)
  To: ml

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

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

[RFC] move chroot/bootstrap packages to bootstrap repository
https://github.com/void-linux/void-packages/pull/39868

Description:
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


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

end of thread, other threads:[~2023-02-04  2:33 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-10 18:27 [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository classabbyamp
2022-10-10 18:33 ` ahesford
2022-10-10 23:18 ` [PR PATCH] [Updated] " classabbyamp
2022-10-11  3:46 ` classabbyamp
2022-10-11  3:54 ` [PR REVIEW] " sgn
2022-10-11  4:11 ` [PR PATCH] [Updated] " classabbyamp
2022-11-20  0:14 ` classabbyamp
2022-11-20  1:45 ` classabbyamp
2023-01-25 17:26 ` [PR PATCH] [Updated] " classabbyamp
2023-01-25 17:48 ` classabbyamp
2023-01-25 18:14 ` [PR PATCH] [Updated] " classabbyamp
2023-02-03 20:13 ` classabbyamp
2023-02-03 20:14 ` classabbyamp
2023-02-04  2:33 ` the-maldridge
2023-02-04  2:33 ` [PR PATCH] [Closed]: " the-maldridge

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).