[oe] [meta-java][RFC][PATCH 7/7] ca-certificates-java: switch to more generic / more correct JAVA (R)DEPENDS

André Draszik git at andred.net
Fri Jul 27 13:29:23 UTC 2018


From: André Draszik <andre.draszik at jci.com>

This recipe here actually depends on Java7 upwards, not Java2 upwards,
so state that dependency correctly using the newly introduced (virtual)
RPROVIDES of the OpenJDK8/OpenJRE8 recipes.

At the same time, we can remove hard-coded references to openjdk-8 and
openjre-8, and thusly make the build more flexible.

Signed-off-by: André Draszik <andre.draszik at jci.com>
---
 .../ca-certificates-java_20180516.bb                   | 10 ++--------
 1 file changed, 2 insertions(+), 8 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 a2d7abd..2ae7352 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,7 @@ 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"
+PACKAGE_WRITE_DEPS += "virtual/java7-runtime-native"
 
 SRC_URI = "\
 	git://salsa.debian.org/java-team/ca-certificates-java.git \
@@ -31,12 +31,6 @@ B = "${WORKDIR}/build"
 
 JARFILENAME = "${BPN}.jar"
 
-python () {
-    runtime = d.getVar("PREFERRED_RPROVIDER_java2-runtime") or ""
-    if not runtime in ("openjdk-8", "openjre-8"):
-        raise bb.parse.SkipRecipe("PREFERRED_RPROVIDER_java2-runtime '%s' unsupported" % runtime)
-}
-
 do_patch_append () {
     bb.build.exec_func('do_fix_sysconfdir', d)
 }
@@ -99,7 +93,7 @@ pkg_postinst_${PN} () {
 }
 
 RDEPENDS_${PN} = "ca-certificates"
-RDEPENDS_${PN}_append_class-target = " java2-runtime"
+RDEPENDS_${PN}_append_class-target = " virtual-java7-runtime"
 
 FILES_${PN} += "${datadir_java}"
 
-- 
2.18.0




More information about the Openembedded-devel mailing list