[meta-java][master-next][PATCH] ca-certificates-java: add support for openjdk-7

[meta-java][master-next][PATCH] ca-certificates-java: add support for openjdk-7

[Richard Leitner]

As this package should be fully comaptible with openjdk-7{-jre} add
support for it.

Furthermore depend on icedtea7-native instead of openjdk-8-native
because it should be availabe already. Otherwise openjdk-8-native would
be built only for this recipe if we use openjdk-7{-jre} only.

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
---
 recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
index 2db1915..52443ed 100644
--- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
+++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
@@ -14,7 +14,9 @@ DEPENDS = "virtual/javac-native fastjar-native"
 # We can't use virtual/javac-native, because that would create a
 # keystore that can't be read on the target (as virtual/javac-native
 # usually is either too old, or plain incompatible with this)
-PACKAGE_WRITE_DEPS += "openjdk-8-native"
+# Therefore we use icedtea7-native as it's a dependency for all our openjdk
+# versions and should therefore be available already.
+PACKAGE_WRITE_DEPS += "icedtea7-native"
 
 SRC_URI = "\
 	git://salsa.debian.org/java-team/ca-certificates-java.git \
@@ -33,7 +35,7 @@ JARFILENAME = "${BPN}.jar"
 
 python () {
     runtime = d.getVar("PREFERRED_RPROVIDER_java2-runtime") or ""
-    if not runtime in ("openjdk-8", "openjre-8"):
+    if not runtime in ("openjdk-8", "openjre-8", "openjdk-7-jre"):
         raise bb.parse.SkipRecipe("PREFERRED_RPROVIDER_java2-runtime '%s' unsupported" % runtime)
 }
 
-- 
2.11.0

Re: [meta-java][master-next][PATCH] ca-certificates-java: add support for openjdk-7

[Richard Leitner]

Hi,
please just ignore this patch... I sent it by accident... Sorry!

regards;Richard.L

On 08/02/2018 11:16 AM, Richard Leitner wrote:
> As this package should be fully comaptible with openjdk-7{-jre} add
> support for it.
> 
> Furthermore depend on icedtea7-native instead of openjdk-8-native
> because it should be availabe already. Otherwise openjdk-8-native would
> be built only for this recipe if we use openjdk-7{-jre} only.
> 
> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
> ---
>  recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
> index 2db1915..52443ed 100644
> --- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
> +++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
> @@ -14,7 +14,9 @@ DEPENDS = "virtual/javac-native fastjar-native"
>  # We can't use virtual/javac-native, because that would create a
>  # keystore that can't be read on the target (as virtual/javac-native
>  # usually is either too old, or plain incompatible with this)
> -PACKAGE_WRITE_DEPS += "openjdk-8-native"
> +# Therefore we use icedtea7-native as it's a dependency for all our openjdk
> +# versions and should therefore be available already.
> +PACKAGE_WRITE_DEPS += "icedtea7-native"
>  
>  SRC_URI = "\
>  	git://salsa.debian.org/java-team/ca-certificates-java.git \
> @@ -33,7 +35,7 @@ JARFILENAME = "${BPN}.jar"
>  
>  python () {
>      runtime = d.getVar("PREFERRED_RPROVIDER_java2-runtime") or ""
> -    if not runtime in ("openjdk-8", "openjre-8"):
> +    if not runtime in ("openjdk-8", "openjre-8", "openjdk-7-jre"):
>          raise bb.parse.SkipRecipe("PREFERRED_RPROVIDER_java2-runtime '%s' unsupported" % runtime)
>  }
>  
>