aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-09-18 16:10:43 +0100
committerRichard Leitner <dev@g0hl1n.net>2018-10-22 15:15:12 +0200
commit634ac5baf998abd256309cc41f5f8a24045de8a3 (patch)
treec641939263580f3e40ba76db642aa1a49244dc92 /recipes-core/openjdk
parent7f9dfe70b5990e0c244bb3826d5a0c19ebd0e69d (diff)
downloadmeta-java-634ac5baf998abd256309cc41f5f8a24045de8a3.tar.gz
meta-java-634ac5baf998abd256309cc41f5f8a24045de8a3.tar.bz2
meta-java-634ac5baf998abd256309cc41f5f8a24045de8a3.zip
openjdk-8: support rm_work disabled
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@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc1
1 files changed, 1 insertions, 0 deletions
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() {