[oe] [meta-java][PATCH 1/3] ca-certificates-java: Fix sysconfdir for -native recipe
Yevgeny Popovych
yevgenyp at pointgrab.com
Fri Sep 7 18:10:08 UTC 2018
When ca-certificates-java-native is built, sysconfdir variable will
be set to value that includes WORKDIR.
Avoid patching source with this value - use sysconfdir_native.
Change-Id: I8ac79c3cd5016a8139d9d8c8d58bc2976d0b6fa3
Signed-off-by: Yevgeny Popovych <yevgenyp at pointgrab.com>
---
.../ca-certificates-java/ca-certificates-java_20180516.bb | 9 +++++++--
1 file changed, 7 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..7db5110 100644
--- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
+++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
@@ -41,9 +41,14 @@ do_patch_append () {
bb.build.exec_func('do_fix_sysconfdir', d)
}
+# sysconfdir will include absolute native sysroot path in -native builds, avoid this
+# (see 36.24 of https://www.yoctoproject.org/docs/2.5/mega-manual/mega-manual.html#faq)
+SYSCONFDIR_VALUE_class-target = "${sysconfdir}"
+SYSCONFDIR_VALUE_class-native = "${sysconfdir_native}"
+
do_fix_sysconfdir () {
- sed -e 's|/etc/ssl/certs/java|${sysconfdir}/ssl/certs/java|g' \
- -i ${S}/src/main/java/org/debian/security/UpdateCertificates.java
+ sed -e 's|/etc/ssl/certs/java|${SYSCONFDIR_VALUE}/ssl/certs/java|g' \
+ -i ${S}/src/main/java/org/debian/security/UpdateCertificates.java
}
do_compile () {
--
2.7.4
More information about the Openembedded-devel
mailing list