summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD65
-rw-r--r--jdk.install16
3 files changed, 46 insertions, 58 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e3f439986177..624dcfa52d12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
pkgbase = zulu-embedded-jdk11
pkgdesc = Zulu Embedded is a certified build of OpenJDK for Armv8/v7/v6 devices.
- pkgver = 11.0.6
- pkgrel = 2
+ pkgver = 11.0.18
+ pkgrel = 1
url = https://www.azul.com/products/zulu-embedded
install = jdk.install
arch = armv6h
arch = armv7h
arch = armv8h
+ arch = aarch64
arch = i686
arch = x86_64
license = custom
depends = java-runtime-common>=3
- depends = java-environment-common>=3
+ depends = java-environment-common=3
depends = ca-certificates-utils
depends = nss
depends = libjpeg-turbo
@@ -22,9 +23,19 @@ pkgbase = zulu-embedded-jdk11
depends = libelf
provides = java-environment=11
provides = java-runtime=11
+ provides = java-runtime-headless=11
options = !strip
- source = http://cdn.azul.com/zulu-embedded/bin/zulu11.37.48-ca-jdk11.0.6-linux_aarch32hf.tar.gz
- sha256sums = 127f271a225136cdba76e0ba0035522a99cf386c21b3d0e669586d865bb98994
+ source_armv6h = https://cdn.azul.com/zulu-embedded/bin/zulu11.62.17-ca-jdk11.0.18-linux_aarch32hf.tar.gz
+ sha256sums_armv6h = 8ba7a6bc773f934bc95d1e26a3209e97ae947905df284548b0628be5864a8f0b
+ source_armv7h = https://cdn.azul.com/zulu-embedded/bin/zulu11.62.17-ca-jdk11.0.18-linux_aarch32hf.tar.gz
+ sha256sums_armv7h = 8ba7a6bc773f934bc95d1e26a3209e97ae947905df284548b0628be5864a8f0b
+ source_armv8h = https://cdn.azul.com/zulu-embedded/bin/zulu11.62.17-ca-jdk11.0.18-linux_aarch32hf.tar.gz
+ sha256sums_armv8h = 8ba7a6bc773f934bc95d1e26a3209e97ae947905df284548b0628be5864a8f0b
+ source_aarch64 = https://cdn.azul.com/zulu-embedded/bin/zulu11.62.17-ca-jdk11.0.18-linux_aarch64.tar.gz
+ sha256sums_aarch64 = 9f5ac83b584a297c792cc5feb67c752a2d9fc1259abec3a477e96be8b672f452
+ source_i686 = https://cdn.azul.com/zulu/bin/zulu11.62.17-ca-jdk11.0.18-linux_i686.tar.gz
+ sha256sums_i686 = f79c37ff6873f0eb3b82cf1e8bc302ee078c658631eade9d6ba9bdc69728e113
+ source_x86_64 = https://cdn.azul.com/zulu/bin/zulu11.62.17-ca-jdk11.0.18-linux_x64.tar.gz
+ sha256sums_x86_64 = 6fae6811b0f3aebb14c3e59a5fde14481cff412ef8ca23221993f1ab33269aab
pkgname = zulu-embedded-jdk11
-
diff --git a/PKGBUILD b/PKGBUILD
index ba7993490e04..ade887444039 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,36 @@
-# Maintainer: Skydrome <skydrome at protonmail dot com>
+# Maintainer: Christoph Scholz <christoph.scholz@gmail.com>
pkgname=zulu-embedded-jdk11
-pkgver=11.0.6
-pkgrel=2
+pkgver=11.0.18
+pkgrel=1
pkgdesc='Zulu Embedded is a certified build of OpenJDK for Armv8/v7/v6 devices.'
-arch=('armv6h' 'armv7h' 'armv8h' 'i686' 'x86_64')
+arch=('armv6h' 'armv7h' 'armv8h' 'aarch64' 'i686' 'x86_64')
url='https://www.azul.com/products/zulu-embedded'
license=('custom')
install=jdk.install
options=(!strip)
-provides=("java-environment=11" "java-runtime=11")
-depends=('java-runtime-common>=3' 'java-environment-common>=3'
+provides=("java-environment=11" "java-runtime=11" "java-runtime-headless=11")
+depends=('java-runtime-common>=3' 'java-environment-common=3'
'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet'
'freetype2' 'giflib' 'libelf')
-#CARCH=armv7h
-
-case "$CARCH" in
- armv?h) _arch='aarch32hf'
- _build=11.37.48
- sha256sums=('127f271a225136cdba76e0ba0035522a99cf386c21b3d0e669586d865bb98994')
- ;;
- aarch64) _arch='aarch64'
- _build=13.29.10
- pkgver=13.0.2
- sha256sums=('4640daea59599d23e1d393789e393a8e21f5a3c12238d86d40e5ee5d048da26d')
- provides=("java-environment=13" "java-runtime=13")
- ;;
- i686) _arch='i686'
- _build=14.28.21
- pkgver=14.0.1
- sha256sums=('bc29244e547d5301ac2054d581cfefb37c33e427c58acc12b56fbb3c91ad3d60')
- source=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_i686.tar.gz")
- provides=("java-environment=14" "java-runtime=14")
- ;;
- x86_64) _arch='x64'
- _build=14.28.21
- pkgver=14.0.1
- sha256sums=('48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa')
- source=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_x64.tar.gz")
- provides=("java-environment=14" "java-runtime=14")
- ;;
-esac
-
-_archive="zulu${_build}-ca-jdk${pkgver}-linux_${_arch}"
-source=(${source:-"http://cdn.azul.com/zulu-embedded/bin/${_archive}.tar.gz"})
-
-_jvmdir="usr/lib/jvm/zulu-embedded-${pkgver%%.*}"
-
+_build=11.62.17
+source_armv6h=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch32hf.tar.gz")
+sha256sums_armv6h=('8ba7a6bc773f934bc95d1e26a3209e97ae947905df284548b0628be5864a8f0b')
+source_armv7h=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch32hf.tar.gz")
+sha256sums_armv7h=('8ba7a6bc773f934bc95d1e26a3209e97ae947905df284548b0628be5864a8f0b')
+source_armv8h=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch32hf.tar.gz")
+sha256sums_armv8h=('8ba7a6bc773f934bc95d1e26a3209e97ae947905df284548b0628be5864a8f0b')
+source_aarch64=("https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_aarch64.tar.gz")
+sha256sums_aarch64=('9f5ac83b584a297c792cc5feb67c752a2d9fc1259abec3a477e96be8b672f452')
+source_i686=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_i686.tar.gz")
+sha256sums_i686=('f79c37ff6873f0eb3b82cf1e8bc302ee078c658631eade9d6ba9bdc69728e113')
+source_x86_64=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_x64.tar.gz")
+sha256sums_x86_64=('6fae6811b0f3aebb14c3e59a5fde14481cff412ef8ca23221993f1ab33269aab')
+
+_jvmdir="usr/lib/jvm/zulu-embedded-11"
package() {
- cd "$_archive"
+ cd "$(basename *.tar.gz .tar.gz)"
install -dm 755 "${pkgdir}/${_jvmdir}"
cp -a . "${pkgdir}/${_jvmdir}/"
@@ -68,7 +49,7 @@ package() {
# Man pages
for f in man/man1/*; do
- install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-zulu.1}"
+ install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-zulu11.1}"
done
rm -rf "${pkgdir}/${_jvmdir}/man"
ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
diff --git a/jdk.install b/jdk.install
index 5733331e7fab..86e0191f5f74 100644
--- a/jdk.install
+++ b/jdk.install
@@ -1,8 +1,4 @@
-case "$CARCH" in
- armv?h) THIS_JDK='zulu-embedded-11' ;;
- aarch64) THIS_JDK='zulu-embedded-13' ;;
- i686|x86_64) THIS_JDK='zulu-embedded-14' ;;
-esac
+THIS_JDK='zulu-embedded-11'
fix_default() {
if [ ! -x /usr/bin/java ]; then
@@ -16,7 +12,7 @@ fix_default() {
post_install() {
default=$(fix_default)
case ${default} in
- "" | ${THIS_JDK}/jre)
+ "")
/usr/bin/archlinux-java set ${THIS_JDK}
;;
${THIS_JDK})
@@ -37,7 +33,7 @@ post_install() {
post_upgrade() {
default=$(fix_default)
- if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
+ if [ -z "${default}" ]; then
/usr/bin/archlinux-java set ${THIS_JDK}
fi
@@ -50,9 +46,9 @@ post_upgrade() {
pre_remove() {
if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
- /usr/bin/archlinux-java unset
- if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
- /usr/bin/archlinux-java set ${THIS_JDK}/jre
+ # Check JRE is still available
+ if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
+ /usr/bin/archlinux-java unset
fi
fi
}