Verified Commit 192bbf9b authored by Alex Denes's avatar Alex Denes 🔧
Browse files

all-java: pkgver in provides

Follow-up on !13757
parent f8be831d
Pipeline #85087 failed with stages
in 163 minutes and 5 seconds
......@@ -3,7 +3,7 @@
pkgname=openjdk10
pkgver=10.0.2_p13
_pkgver=${pkgver/_p/+}
pkgrel=3
pkgrel=4
pkgdesc="Oracle OpenJDK 10"
provider_priority=10
url="https://hg.openjdk.java.net/jdk-updates/jdk10u"
......@@ -218,7 +218,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 10 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -244,7 +244,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 10 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -287,7 +287,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 10 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
......@@ -3,7 +3,7 @@
pkgname=openjdk11
pkgver=11.0.11_p9
_pkgver=${pkgver/_p9/-ga}
pkgrel=0
pkgrel=1
pkgdesc="Oracle OpenJDK 11"
provider_priority=11
url="https://github.com/openjdk/jdk11u"
......@@ -261,7 +261,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 11 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -287,7 +287,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 11 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -324,7 +324,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 11 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
......@@ -7,7 +7,7 @@ _icedteaversrc=$_icedteaver
# pkgver is <JDK version>.<JDK update>
# check icedtea JDK when updating
pkgver=7.281.$_icedteaver
pkgrel=1
pkgrel=2
pkgdesc="OpenJDK 7 via IcedTea"
provider_priority=7
url="https://icedtea.classpath.org/"
......@@ -261,7 +261,7 @@ build() {
}
package() {
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
mkdir -p "$pkgdir"/$_install_base
cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$_install_base
rm "$pkgdir"/$_install_base/src.zip
......@@ -289,7 +289,7 @@ jrelib() {
jrebase() {
pkgdesc="OpenJDK 7 Java Runtime (no GUI support)"
depends="$pkgname-jre-lib java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
mkdir -p "$subpkgdir"/$_install_base/bin
......@@ -306,7 +306,7 @@ jre() {
pkgdesc="OpenJDK 7 Java Runtime"
# manually depend to avoid clash with libgcj's libjvm.so
depends="so:openjdk7:libjvm.so=0"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
mkdir -p "$subpkgdir"
local a; for a in jre/bin/policytool \
......
......@@ -6,7 +6,7 @@ _icedteaver=3.18.0
# pkgver is <JDK version>.<JDK update>.<JDK build>
# Check https://icedtea.classpath.org/wiki/Main_Page when updating!
pkgver=8.282.08
pkgrel=1
pkgrel=2
pkgdesc="OpenJDK 8 provided by IcedTea"
provider_priority=8
url="https://icedtea.classpath.org/"
......@@ -289,7 +289,7 @@ check() {
}
package() {
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
mkdir -p "$pkgdir"/$_java_home
cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/
......@@ -329,7 +329,7 @@ jrelib() {
jre() {
pkgdesc="OpenJDK 8 Java Runtime"
depends="ttf-dejavu"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
local file dir
mkdir -p "$subpkgdir"
......@@ -351,7 +351,7 @@ jre() {
jrebase() {
pkgdesc="OpenJDK 8 Java Runtime (no GUI support)"
depends="$pkgname-jre-lib java-common java-cacerts nss"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
mkdir -p "$subpkgdir"/$_java_home/bin \
"$subpkgdir"/$_java_home/lib/$_jarch
......
......@@ -3,7 +3,7 @@
pkgname=openjdk9
pkgver=9.0.4_p12
_pkgver=${pkgver/_p/+}
pkgrel=4
pkgrel=5
pkgdesc="Oracle OpenJDK 9"
provider_priority=9
url="https://hg.openjdk.java.net/jdk-updates/jdk9u"
......@@ -242,7 +242,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 9 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -269,7 +269,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 9 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -312,7 +312,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 9 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
......@@ -3,7 +3,7 @@
pkgname=openjdk12
pkgver=12.0.2_p10
_pkgver=${pkgver/_p10/-ga}
pkgrel=3
pkgrel=4
pkgdesc="Oracle OpenJDK 12"
provider_priority=12
url="https://hg.openjdk.java.net/jdk-updates/jdk12u"
......@@ -219,7 +219,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 12 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -245,7 +245,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 12 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -282,7 +282,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 12 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
......@@ -3,7 +3,7 @@
pkgname=openjdk13
pkgver=13.0.7_p5
_pkgver=${pkgver%_p*}-ga
pkgrel=0
pkgrel=1
pkgdesc="Oracle OpenJDK 13"
provider_priority=13
url="https://github.com/openjdk/jdk13u"
......@@ -217,7 +217,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 13 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -243,7 +243,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 13 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -280,7 +280,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 13 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
......@@ -3,7 +3,7 @@
pkgname=openjdk14
pkgver=14.0.2_p12
_pkgver=${pkgver%_p*}-ga
pkgrel=2
pkgrel=3
pkgdesc="Oracle OpenJDK 14"
provider_priority=14
url="https://hg.openjdk.java.net/jdk-updates/jdk14u"
......@@ -217,7 +217,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 14 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -243,7 +243,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 14 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -278,7 +278,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 14 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
......@@ -3,7 +3,7 @@
pkgname=openjdk15
pkgver=15.0.3_p3
_pkgver=${pkgver%_p*}-ga
pkgrel=0
pkgrel=1
pkgdesc="Oracle OpenJDK 15"
provider_priority=15
url="https://github.com/openjdk/jdk15u"
......@@ -216,7 +216,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 15 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -242,7 +242,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 15 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -278,7 +278,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 15 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
......@@ -3,7 +3,7 @@
pkgname=openjdk16
pkgver=16.0.1_p9
_pkgver=${pkgver%_p*}-ga
pkgrel=0
pkgrel=1
pkgdesc="Oracle OpenJDK 16"
provider_priority=16
url="https://hg.openjdk.java.net/jdk-updates/jdk16u"
......@@ -208,7 +208,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 16 (JRE)"
depends="$pkgname-jre-headless"
provides=java-jre
provides="java-jre=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -234,7 +234,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 16 (JRE headless)"
depends="java-common java-cacerts"
provides=java-jre-headless
provides="java-jre-headless=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......@@ -270,7 +270,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 16 (JDK)"
depends="$pkgname-jre"
provides=java-jdk
provides="java-jdk=$pkgver-r$pkgrel"
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment