From: Nadav Har'El <[email protected]>
Committer: Nadav Har'El <[email protected]>
Branch: master
openjdk8-fedora: simplify preparation of image content
Just treat "install/" as the contents of what will be installed on the
image. No need for convoluted python magic in module.py to override what
we put in the install/ directory - it only complicates matters.
Signed-off-by: Nadav Har'El <[email protected]>
---
diff --git a/openjdk8-fedora/Makefile b/openjdk8-fedora/Makefile
--- a/openjdk8-fedora/Makefile
+++ b/openjdk8-fedora/Makefile
@@ -55,7 +55,10 @@ module:
mkdir -p install/usr
ln -s lib install/usr/lib64
rpm2cpio upstream/$(java_fullname) | (cd install && cpio -id)
- ln -sf java-1.8.0-openjdk-$(java_version).x86_64 $(jvm_dir)/java
+ # Move the versioned java directory to the generic "java" name, but
+ # keep a link at the versioned name:
+ mv $(jvm_dir)/java-1.8.0-openjdk-$(java_version).x86_64 $(jvm_dir)/java
+ ln -sf java $(jvm_dir)/java-1.8.0-openjdk-$(java_version).x86_64
rm -rf $(jvm_dir)/java/jre/lib/security/cacerts
rm -rf $(jvm_dir)/java/jre/lib/audio/*
rpm2cpio upstream/$(tzdata_fullname) | (cd install && cpio -id)
diff --git a/openjdk8-fedora/module.py b/openjdk8-fedora/module.py
--- a/openjdk8-fedora/module.py
+++ b/openjdk8-fedora/module.py
@@ -12,7 +12,4 @@
usr_files = FileMap()
usr_files.add('${OSV_BASE}/apps/openjdk8-fedora/install').to('/').allow_symlink()
-usr_files.add('${OSV_BASE}/apps/openjdk8-fedora/install/usr/lib/jvm/java')
\
- .to('/usr/lib/jvm/java') \
- .allow_symlink()
usr_files.link('/usr/lib/jvm/jre').to('/usr/lib/jvm/java/jre')
--
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 [email protected].
For more options, visit https://groups.google.com/d/optout.
