From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master
openjdk9 and above: fix makefile to enforce usr.manifest is re-generated
everytime
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
diff --git a/modules/openjdk9_1x-from-host/Makefile
b/modules/openjdk9_1x-from-host/Makefile
--- a/modules/openjdk9_1x-from-host/Makefile
+++ b/modules/openjdk9_1x-from-host/Makefile
@@ -20,11 +20,11 @@ module:
"javac 1"[0-9]*) ;; \
*) echo "Requires Java 9 or later"; exit 1 ;; \
esac
- $(call very-quiet, if [ "$(libsunec_path)" != "" ]; then
$(SRC)/scripts/manifest_from_host.sh $(libsunec_path) > usr.manifest; fi)
- $(call very-quiet, $(SRC)/scripts/manifest_from_host.sh -li
libfreeblpriv3.so >> usr.manifest)
+ $(call very-quiet, $(SRC)/scripts/manifest_from_host.sh -li
libfreeblpriv3.so > usr.manifest)
$(call very-quiet, $(SRC)/scripts/manifest_from_host.sh -li libnss3.so
>> usr.manifest)
$(call very-quiet, echo "/usr/lib/jvm/java/lib/security/default.policy:
$(java_jdk_path)/lib/security/default.policy" >> usr.manifest)
$(call very-quiet, echo "/usr/lib/jvm/java/conf/**:
$(java_jdk_path)/conf/**" >> usr.manifest)
+ $(call very-quiet, if [ "$(libsunec_path)" != "" ]; then
$(SRC)/scripts/manifest_from_host.sh $(libsunec_path) >> usr.manifest; fi)
clean:
rm -f usr.manifest
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/00000000000065886005f7a763be%40google.com.
