[oe] [meta-java][PATCH 2/3] ca-certificates-java: Don't fail when called via hook on do_rootfs
Yevgeny Popovych
yevgenyp at pointgrab.com
Fri Sep 7 18:10:09 UTC 2018
It is possible that ca-certificates-java hook will be called via
update-ca-certificates hook during do_roofs (the case when D is set
and JVM_LIBDIR is not).
This is a valid case so don't fail.
Change-Id: I908e2f0acec487c41499543014014e29919bd6ab
Signed-off-by: Yevgeny Popovych <yevgenyp at pointgrab.com>
---
.../ca-certificates-java/ca-certificates-java.hook.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-core/ca-certificates-java/ca-certificates-java/ca-certificates-java.hook.in b/recipes-core/ca-certificates-java/ca-certificates-java/ca-certificates-java.hook.in
index 89c764f..611a4ef 100755
--- a/recipes-core/ca-certificates-java/ca-certificates-java/ca-certificates-java.hook.in
+++ b/recipes-core/ca-certificates-java/ca-certificates-java/ca-certificates-java.hook.in
@@ -14,9 +14,9 @@ jvm_libdir="@@libdir_jvm@@"
if [ -n "${D:-}" ] ; then
# called from postinst as part of image build on host
if [ -z "${JVM_LIBDIR:-}" ] ; then
- # should never happen, this is supposed to be passed in
- echo "$0: no JVM_LIBDIR specified" >&2
- false
+ # if JVM_LIBDIR is not present - we were called as a hook
+ echo "called as a hook of ca-certificates on do_rootfs, exiting"
+ exit 0
fi
fi
if [ -n "${JVM_LIBDIR:-}" ] ; then
--
2.7.4
More information about the Openembedded-devel
mailing list