[oe] [meta-java][PATCH] openjdk-8: support rm_work disabled
André Draszik
git at andred.net
Tue Sep 18 15:10:43 UTC 2018
From: André Draszik <andre.draszik at jci.com>
Now that generation of the Java keystore actually works (again?),
OE-core commit 09bb7718d74 ("ca-certificates: use relative symlinks from $ETCCERTSDIR"),
do_compile() will fail when invoked multiple times.
The reason is that during do_compile(), the Java keytool is
used to create a Java keystore with the certificates provided
by ca-certificates. Before above OE-core commit, no
certificates were actually being added, but as certificates
are being added now, multiple do_compile() runs will end up
adding the same certificate twice when rm_work is disabled,
causing a keytool exception, as that is not allowed.
So let's remove any previously generated keystore before trying
to add certificates to it.
Signed-off-by: André Draszik <andre.draszik at jci.com>
---
This applies on top of commit ec5aae3d ("conf: distro: add mejate{,-musl} distributions")
---
recipes-core/openjdk/openjdk-8-native.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index 6a01046..bae5d09 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -55,6 +55,7 @@ do_configure_prepend() {
do_compile_prepend() {
export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
+ rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts"
}
do_compile_append() {
--
2.19.0
More information about the Openembedded-devel
mailing list