summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-11-13 01:45:56 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2022-11-21 02:08:06 -0600
commit3ff4b8c8548f6b45f93367f2ea8d151844f43c8f (patch)
treefb9da1229999f9a538eab443f7c0eb0cacfc248e
parent708d646a71ce65a01413d6329731d9c03d74303b (diff)
downloadpackages-3ff4b8c8548f6b45f93367f2ea8d151844f43c8f.tar.gz
packages-3ff4b8c8548f6b45f93367f2ea8d151844f43c8f.tar.bz2
packages-3ff4b8c8548f6b45f93367f2ea8d151844f43c8f.tar.xz
packages-3ff4b8c8548f6b45f93367f2ea8d151844f43c8f.zip
user/openjdk8: Use RC2 for bootstrap binaries
The bootstrap packages are taken from the user/openjdk8 packages built in 1.0-RC2. This has been smoke-tested on PPC64. It only unpacks the target arch and will print an error if the target arch is not yet bootstrapped. The bootstrap packages were created using the 'maintain' script.
-rw-r--r--user/openjdk8/APKBUILD19
-rwxr-xr-xuser/openjdk8/maintain47
2 files changed, 63 insertions, 3 deletions
diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD
index 0336c2dac..86a052d72 100644
--- a/user/openjdk8/APKBUILD
+++ b/user/openjdk8/APKBUILD
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
depends="$pkgname-jre java-cacerts"
makedepends="bash findutils libarchive-tools zip file util-linux libxslt
autoconf automake linux-headers sed xz coreutils
- $pkgname-bootstrap ca-certificates libjpeg-turbo-dev cmd:which
+ fastjar ca-certificates libjpeg-turbo-dev cmd:which
nss-dev nss-static cups-dev giflib-dev libpng-dev libxt-dev
lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev
libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev
@@ -29,7 +29,7 @@ ppc64) _jarch=ppc64
*) _jarch="$CARCH";;
esac
-_bootstrap_java_home="/usr/lib/jvm/java-1.8-openjdk"
+_bootstrap_java_home="$srcdir/boot-home/$CARCH"
_java_home="/usr/lib/jvm/java-1.8-openjdk"
_jrelib="$_java_home/jre/lib/$_jarch"
@@ -69,6 +69,12 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.x
project-autoconf-2xx.patch
"
+_targets="aarch64 pmmx ppc ppc64 x86_64"
+for target in $_targets; do
+ source="$source
+ https://distfiles.adelielinux.org/source/openjdk/openjdk8-bootstrap-$target.txz
+ "
+done
builddir="$srcdir/icedtea-$_icedteaver"
# secfixes:
@@ -147,6 +153,8 @@ unpack() {
mkdir -p "$srcdir"
msg "Unpacking sources..."
tar -C "$srcdir" -Jxf icedtea-$_icedteaver.tar.xz
+ tar -C "$srcdir" -xJf openjdk8-bootstrap-$CARCH.txz \
+ || die "Architecture $CARCH not bootstrapped"
}
prepare() {
@@ -336,4 +344,9 @@ b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec8
974fb54532b7e7d738f4278187fc6bd9f9b2d99866b94f68a617ee4911c89a3b8cc41ecfdcaefecf9157492d006b1844b6b0b41ac4209d84f9e8d13c9e485dd3 icedtea-jdk-includes.patch
662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167 icedtea-autoconf-config.patch
b0f6d07c6a949acdc8b4a25bf924f134f468e162f01dd440fd4ca80769fb84a0a54210f93efbe88012404fe3db6701aad31cdbc772bc054ad69021c37db5538c remove-gawk.patch
-6dd39baca14f088d0b2157308e3d9657ab64ecdb7daab09137486e212e3a8c53f6deae6167b6212217c6ef29c1406347e21ca6bb193ced9ebeb399aeb06bda4b project-autoconf-2xx.patch"
+6dd39baca14f088d0b2157308e3d9657ab64ecdb7daab09137486e212e3a8c53f6deae6167b6212217c6ef29c1406347e21ca6bb193ced9ebeb399aeb06bda4b project-autoconf-2xx.patch
+29b2ee1920285acb8e842f9502c5fb1ca791ee47a8887e35bc16cb21a4cd9f2a25c74508cca2c3311a8351a9796cce34ec7ac32c177117cf7f54bbdfcce1dbc9 openjdk8-bootstrap-aarch64.txz
+c91ff930d85967e5909b6d4e108c6ad37866287b1e3d23065b693b8fd275d4136d3764c541637d22f2aaa4e0cd7fadda686c400e82c27c4eecf67d79c78c8e16 openjdk8-bootstrap-pmmx.txz
+103c67808fc004a039bb2e7482f50ac96f35d040b918be6444129915e210c207d813f08fe3ec837ac3d753beed3542737fd4e733ed542fe277c8278cbb12f564 openjdk8-bootstrap-ppc.txz
+6a411c549064b0242b976560f0ebca5c9eba2f419c2eb73af4dfc7901e2623c31b19b6fc94c428a75c73d5ced783b8f7b14984193c8b4e2a059d7046e8ebeb91 openjdk8-bootstrap-ppc64.txz
+877fc16d855d381465f0662ed75c19ef9408311a37bcd75ddea8ac950965a7e6f42c582796640e0029a960b15f8495c0c597b0d5b5a2c59b03b6741bfb1b77cb openjdk8-bootstrap-x86_64.txz"
diff --git a/user/openjdk8/maintain b/user/openjdk8/maintain
new file mode 100755
index 000000000..bd0f69533
--- /dev/null
+++ b/user/openjdk8/maintain
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+##
+# This script downloads RC2 'openjdk8' .apk files,
+# extracts some JVM bits, and produces tarballs for
+# bootstrapping this package, suitable for upload to
+# https://distfiles.adelielinux.org/source/openjdk/.
+#
+# Note: checksums may vary between 'tar' versions or
+# implementations; please do not rely on this. The
+# output has been verified by 'diff -qr', may differ
+# in packing order, compression, or headers only.
+#
+# Based on https://git.adelielinux.org/-/snippets/172.
+#
+HERE="$(dirname $(readlink -f ${0}))";
+
+host=https://distfiles.adelielinux.org;
+repo=1.0-rc2;
+vers=8.252.09-r0;
+keep=usr/lib/jvm/java-1.8-openjdk;
+arch="aarch64 armv7 ppc64 ppc x86_64 pmmx";
+apks="
+openjdk8-jre-lib
+openjdk8-jre-base
+openjdk8-jre
+openjdk8
+";
+
+
+for cpu in $arch; do
+ printf "\n%s\n" "$cpu";
+ rm -fr "${HERE}"/$cpu; # sanity
+ mkdir -p "${HERE}"/$cpu/boot-home;
+ for apk in $apks; do
+ printf " * %s\n" "$apk-$vers.apk";
+ curl -s $host/adelie/$repo/user/$cpu/$apk-$vers.apk \
+ | tar -C "${HERE}"/$cpu -xzf - 2>/dev/null;
+ done
+ cp -a "${HERE}"/$cpu/$keep "${HERE}"/$cpu/boot-home/$cpu;
+ (
+ cd "${HERE}"/$cpu;
+ chown -R 1000:1000 boot-home;
+ tar -cJf "${HERE}"/openjdk8-bootstrap-$cpu.txz boot-home;
+ )
+ rm -fr "${HERE}"/$cpu;
+done \ No newline at end of file