[COMMIT osv master] openjdk9 and above: fix makefile to enforce usr.manifest is re-generated everytime

5 views
Skip to first unread message

Commit Bot

unread,
Mar 24, 2023, 11:53:04 AM3/24/23
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

openjdk9 and above: fix makefile to enforce usr.manifest is re-generated everytime

Signed-off-by: Waldemar Kozaczuk <jwkoz...@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
Reply all
Reply to author
Forward
0 new messages