summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD29
2 files changed, 18 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6da07560ac48..3cfb91b08cdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,8 +11,11 @@ pkgbase = jdk10-openjdk-openj9-bin
depends = ca-certificates-utils
depends = nss
provides = java-environment=10
+ provides = java-environment-openjdk=10
provides = java-runtime=10
+ provides = java-runtime-openjdk=10
provides = java-runtime-headless=10
+ provides = java-runtime-headless-openjdk=10
noextract = OpenJDK10-OPENJ9_x64_Linux_jdk-10.0.2.u13_openj9-0.2%2B13.tar.gz
source = https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-10.0.2%2B13_openj9-0.9.0/OpenJDK10-OPENJ9_x64_Linux_jdk-10.0.2.13_openj9-0.9.0.tar.gz
sha256sums = 1ef0dab3853b2f3666091854ef8149fcb85970254558d5d62cfa9446831779d1
diff --git a/PKGBUILD b/PKGBUILD
index 9103100b08f0..d8c30f4cfe2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,24 +6,25 @@ _pkgver_split="0.2"
_pkgver_build="13"
_pkgver_minweb="0.2%2B13"
_openj_ver="0.9.0"
-_majver_java="10"
-pkgver=${_majver_java}.${_pkgver_split}.u${_pkgver_build}
-_pkgsum_name="OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${pkgver}_openj9-${_openj_ver}.sha256.txt"
-_pkgsum_sha256="wget -q https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-${_majver_java}.${_pkgver_minweb}_openj9-${_openj_ver}/${_pkgsum_name} && cut -d' ' -f1 ${_pkgsum_name}"
+_majjver="10"
+pkgver=${_majjver}.${_pkgver_split}.u${_pkgver_build}
pkgrel=1
-pkgdesc="Eclipse (former IBM) OpenJ9 with openjdk10"
+pkgdesc="Eclipse (former IBM) OpenJ9 with openjdk${_majjver}"
arch=('x86_64')
-url="https://adoptopenjdk.net/releases.html?variant=openjdk10&jvmVariant=openj9#x64_linux"
+url="https://adoptopenjdk.net/releases.html?variant=openjdk${_majjver}&jvmVariant=openj9#x64_linux"
license=('custom')
depends=('java-environment-common' 'ca-certificates-utils' 'nss')
provides=(
-'java-environment=10'
-'java-runtime=10'
-'java-runtime-headless=10'
+"java-environment=${_majjver}"
+"java-environment-openjdk=${_majjver}"
+"java-runtime=${_majjver}"
+"java-runtime-openjdk=${_majjver}"
+"java-runtime-headless=${_majjver}"
+"java-runtime-headless-openjdk=${_majjver}"
)
makedepends=('coreutils' 'bash')
-source=("https://github.com/AdoptOpenJDK/openjdk10-openj9-releases/releases/download/jdk-${_majver_java}.${_pkgver_minweb}_openj9-${_openj_ver}/OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${_majver_java}.${_pkgver_minor}_openj9-${_openj_ver}.tar.gz")
-noextract=("OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${pkgver}_openj9-${_pkgver_minweb}.tar.gz")
+source=("https://github.com/AdoptOpenJDK/openjdk${_majjver}-openj9-releases/releases/download/jdk-${_majjver}.${_pkgver_minweb}_openj9-${_openj_ver}/OpenJDK${_majjver}-OPENJ9_x64_Linux_jdk-${_majjver}.${_pkgver_minor}_openj9-${_openj_ver}.tar.gz")
+noextract=("OpenJDK${_majjver}-OPENJ9_x64_Linux_jdk-${pkgver}_openj9-${_pkgver_minweb}.tar.gz")
# https://github.com/AdoptOpenJDK/openjdk9-openj9-releases/releases/download/jdk-9%2B181/OpenJDK9-OPENJ9_x64_Linux_jdk-9.181.sha256.txt
# extract automatically? [bash -c "${_pkgsum_sha256}"] Could this work?
sha256sums=('1ef0dab3853b2f3666091854ef8149fcb85970254558d5d62cfa9446831779d1')
@@ -32,10 +33,10 @@ package() {
cd "$srcdir"
mkdir -p "${pkgdir}/usr/lib/jvm/"
- tar -xf OpenJDK${_majver_java}-OPENJ9_x64_Linux_jdk-${_majver_java}.${_pkgver_minor}_openj9-${_openj_ver}.tar.gz -C "${pkgdir}/usr/lib/jvm/"
- mv "${pkgdir}/usr/lib/jvm/jdk-${_majver_java}.${_pkgver_split}+${_pkgver_build}" "${pkgdir}/usr/lib/jvm/java-${_majver_java}-j9"
+ tar -xf OpenJDK${_majjver}-OPENJ9_x64_Linux_jdk-${_majjver}.${_pkgver_minor}_openj9-${_openj_ver}.tar.gz -C "${pkgdir}/usr/lib/jvm/"
+ mv "${pkgdir}/usr/lib/jvm/jdk-${_majjver}.${_pkgver_split}+${_pkgver_build}" "${pkgdir}/usr/lib/jvm/java-${_majjver}-j9"
mkdir -p "${pkgdir}/usr/share/licenses"
- ln -s "/usr/lib/jvm/java-${_majver_java}-j9/legal" "${pkgdir}/usr/share/licenses/java-${_majver_java}-j9"
+ ln -s "/usr/lib/jvm/java-${_majjver}-j9/legal" "${pkgdir}/usr/share/licenses/java-${_majjver}-j9"
}