From 0e7f9f9d3e46a9ab4f440dc10ea97e408637707d Mon Sep 17 00:00:00 2001 From: classabbyamp 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 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 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 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 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 " 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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