From 634ac5baf998abd256309cc41f5f8a24045de8a3 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Tue, 18 Sep 2018 16:10:43 +0100 Subject: openjdk-8: support rm_work disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Leitner --- 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() { -- cgit v1.2.3-54-g00ecf