aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frankenberger <simon@fraho.eu>2020-10-19 18:18:20 +0200
committerRasmus Thomsen <oss@cogitri.dev>2021-04-18 22:35:20 +0000
commit8cbf79fe068258f1acf3f5c69d952e82ce6c4d3c (patch)
tree04037ea108f6f5635dca6e348e3d6de3bb9a77c4
parentc6372eb56f76ba7bf211a2a31042aa3abbdacdd2 (diff)
downloadaports-8cbf79fe068258f1acf3f5c69d952e82ce6c4d3c.tar.gz
aports-8cbf79fe068258f1acf3f5c69d952e82ce6c4d3c.tar.bz2
aports-8cbf79fe068258f1acf3f5c69d952e82ce6c4d3c.tar.xz
all-java: add provides for jre, jre-headless and jdk
-rw-r--r--community/openjdk10/APKBUILD6
-rw-r--r--community/openjdk11/APKBUILD6
-rw-r--r--community/openjdk7/APKBUILD6
-rw-r--r--community/openjdk8/APKBUILD6
-rw-r--r--community/openjdk9/APKBUILD6
-rw-r--r--testing/openjdk12/APKBUILD6
-rw-r--r--testing/openjdk13/APKBUILD6
-rw-r--r--testing/openjdk14/APKBUILD6
-rw-r--r--testing/openjdk15/APKBUILD6
-rw-r--r--testing/openjdk16/APKBUILD6
10 files changed, 50 insertions, 10 deletions
diff --git a/community/openjdk10/APKBUILD b/community/openjdk10/APKBUILD
index 21e97eec1b..8940e02077 100644
--- a/community/openjdk10/APKBUILD
+++ b/community/openjdk10/APKBUILD
@@ -3,8 +3,9 @@
pkgname=openjdk10
pkgver=10.0.2_p13
_pkgver=${pkgver/_p/+}
-pkgrel=2
+pkgrel=3
pkgdesc="Oracle OpenJDK 10"
+provider_priority=10
url="https://hg.openjdk.java.net/jdk-updates/jdk10u"
# oracle dropped support for 32 bit
# no bootstrap JDK on mips
@@ -217,6 +218,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 10 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -242,6 +244,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 10 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -284,6 +287,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 10 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
diff --git a/community/openjdk11/APKBUILD b/community/openjdk11/APKBUILD
index 11e33a5086..efd65501f3 100644
--- a/community/openjdk11/APKBUILD
+++ b/community/openjdk11/APKBUILD
@@ -3,8 +3,9 @@
pkgname=openjdk11
pkgver=11.0.10_p9
_pkgver=${pkgver/_p9/-ga}
-pkgrel=0
+pkgrel=1
pkgdesc="Oracle OpenJDK 11"
+provider_priority=11
url="https://hg.openjdk.java.net/jdk-updates/jdk11u"
# oracle dropped support for 32 bit
# no bootstrap JDK on mips
@@ -260,6 +261,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 11 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -285,6 +287,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 11 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -321,6 +324,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 11 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index 969f147575..34a94eb9c1 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -7,8 +7,9 @@ _icedteaversrc=$_icedteaver
# pkgver is <JDK version>.<JDK update>
# check icedtea JDK when updating
pkgver=7.281.$_icedteaver
-pkgrel=0
+pkgrel=1
pkgdesc="OpenJDK 7 via IcedTea"
+provider_priority=7
url="https://icedtea.classpath.org/"
# no bootstrap JDK on mips
arch="all !mips !mips64"
@@ -259,6 +260,7 @@ build() {
}
package() {
+ provides=java-jdk
mkdir -p "$pkgdir"/$_install_base
cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$_install_base
rm "$pkgdir"/$_install_base/src.zip
@@ -286,6 +288,7 @@ jrelib() {
jrebase() {
pkgdesc="OpenJDK 7 Java Runtime (no GUI support)"
depends="$pkgname-jre-lib java-common java-cacerts"
+ provides=java-jre-headless
mkdir -p "$subpkgdir"/$_install_base/bin
@@ -302,6 +305,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
mkdir -p "$subpkgdir"
local a; for a in jre/bin/policytool \
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index f2ce299472..7a3044ab9b 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -6,8 +6,9 @@ _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=0
+pkgrel=1
pkgdesc="OpenJDK 8 provided by IcedTea"
+provider_priority=8
url="https://icedtea.classpath.org/"
# no bootstrap JDK on mips
arch="all !mips !mips64"
@@ -287,6 +288,7 @@ check() {
}
package() {
+ provides=java-jdk
mkdir -p "$pkgdir"/$_java_home
cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/
@@ -326,6 +328,7 @@ jrelib() {
jre() {
pkgdesc="OpenJDK 8 Java Runtime"
depends="ttf-dejavu"
+ provides=java-jre
local file dir
mkdir -p "$subpkgdir"
@@ -347,6 +350,7 @@ jre() {
jrebase() {
pkgdesc="OpenJDK 8 Java Runtime (no GUI support)"
depends="$pkgname-jre-lib java-common java-cacerts nss"
+ provides=java-jre-headless
mkdir -p "$subpkgdir"/$_java_home/bin \
"$subpkgdir"/$_java_home/lib/$_jarch
diff --git a/community/openjdk9/APKBUILD b/community/openjdk9/APKBUILD
index 8219677768..fccd36e196 100644
--- a/community/openjdk9/APKBUILD
+++ b/community/openjdk9/APKBUILD
@@ -3,8 +3,9 @@
pkgname=openjdk9
pkgver=9.0.4_p12
_pkgver=${pkgver/_p/+}
-pkgrel=3
+pkgrel=4
pkgdesc="Oracle OpenJDK 9"
+provider_priority=9
url="https://hg.openjdk.java.net/jdk-updates/jdk9u"
# oracle dropped support for 32 bit
# no bootstrap JDK on mips
@@ -241,6 +242,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 9 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -267,6 +269,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 9 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -309,6 +312,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 9 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
diff --git a/testing/openjdk12/APKBUILD b/testing/openjdk12/APKBUILD
index 8efec2cf74..dacfb872b1 100644
--- a/testing/openjdk12/APKBUILD
+++ b/testing/openjdk12/APKBUILD
@@ -3,8 +3,9 @@
pkgname=openjdk12
pkgver=12.0.2_p10
_pkgver=${pkgver/_p10/-ga}
-pkgrel=2
+pkgrel=3
pkgdesc="Oracle OpenJDK 12"
+provider_priority=12
url="https://hg.openjdk.java.net/jdk-updates/jdk12u"
arch="all !x86 !armhf !armv7 !mips !mips64" # oracle dropped support for 32 bit
license="GPL-2.0-with-classpath-exception"
@@ -218,6 +219,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 12 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -243,6 +245,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 12 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -279,6 +282,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 12 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
diff --git a/testing/openjdk13/APKBUILD b/testing/openjdk13/APKBUILD
index c765aec27a..61c4114ffc 100644
--- a/testing/openjdk13/APKBUILD
+++ b/testing/openjdk13/APKBUILD
@@ -3,8 +3,9 @@
pkgname=openjdk13
pkgver=13.0.4_p8
_pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=2
pkgdesc="Oracle OpenJDK 13"
+provider_priority=13
url="https://hg.openjdk.java.net/jdk-updates/jdk13u"
arch="all !x86 !armhf !armv7 !mips !mips64" # oracle dropped support for 32 bit
license="GPL-2.0-with-classpath-exception"
@@ -216,6 +217,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 13 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -241,6 +243,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 13 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -277,6 +280,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 13 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
diff --git a/testing/openjdk14/APKBUILD b/testing/openjdk14/APKBUILD
index d776a545d2..7f62559811 100644
--- a/testing/openjdk14/APKBUILD
+++ b/testing/openjdk14/APKBUILD
@@ -3,8 +3,9 @@
pkgname=openjdk14
pkgver=14.0.2_p12
_pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=2
pkgdesc="Oracle OpenJDK 14"
+provider_priority=14
url="https://hg.openjdk.java.net/jdk-updates/jdk14u"
arch="all !x86 !armhf !armv7 !mips !mips64" # oracle dropped support for 32 bit
license="GPL-2.0-with-classpath-exception"
@@ -216,6 +217,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 14 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -241,6 +243,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 14 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -275,6 +278,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 14 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
diff --git a/testing/openjdk15/APKBUILD b/testing/openjdk15/APKBUILD
index 6a9098778f..72f4cdee2e 100644
--- a/testing/openjdk15/APKBUILD
+++ b/testing/openjdk15/APKBUILD
@@ -3,8 +3,9 @@
pkgname=openjdk15
pkgver=15.0.2_p7
_pkgver=${pkgver%_p*}-ga
-pkgrel=0
+pkgrel=1
pkgdesc="Oracle OpenJDK 15"
+provider_priority=15
url="https://hg.openjdk.java.net/jdk-updates/jdk15u"
arch="all !x86 !armhf !armv7 !mips !mips64" # oracle dropped support for 32 bit
license="GPL-2.0-with-classpath-exception"
@@ -215,6 +216,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 15 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -240,6 +242,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 15 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -275,6 +278,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 15 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
diff --git a/testing/openjdk16/APKBUILD b/testing/openjdk16/APKBUILD
index f477833abb..0020113251 100644
--- a/testing/openjdk16/APKBUILD
+++ b/testing/openjdk16/APKBUILD
@@ -4,8 +4,9 @@ pkgname=openjdk16
pkgver=16.0.0_p36
#_pkgver=${pkgver%_p*}-ga
_pkgver=16-ga
-pkgrel=0
+pkgrel=1
pkgdesc="Oracle OpenJDK 16"
+provider_priority=16
url="https://hg.openjdk.java.net/jdk-updates/jdk16u"
arch="all !x86 !armhf !armv7 !mips !mips64" # oracle dropped support for 32 bit
license="GPL-2.0-with-classpath-exception"
@@ -208,6 +209,7 @@ _doc() {
_jre() {
pkgdesc="Oracle OpenJDK 16 (JRE)"
depends="$pkgname-jre-headless"
+ provides=java-jre
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -233,6 +235,7 @@ _src() {
_jre_headless() {
pkgdesc="Oracle OpenJDK 16 (JRE headless)"
depends="java-common java-cacerts"
+ provides=java-jre-headless
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"
@@ -268,6 +271,7 @@ _jre_headless() {
_jdk() {
pkgdesc="Oracle OpenJDK 16 (JDK)"
depends="$pkgname-jre"
+ provides=java-jdk
_fromroot="$pkgdir/$_java_home"
_toroot="$subpkgdir/$_java_home"