From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] [RFC] move chroot/bootstrap packages to bootstrap repository
Date: Mon, 10 Oct 2022 20:27:20 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39868@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2022-10-10 18:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-10 18:27 classabbyamp [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39868@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).