Add config files as config | no replace

olivergillespie · Mar 25, 2022 · 5fd26c6 · 5fd26c6
1 parent c91b386
commit 5fd26c6
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -65,6 +65,19 @@ allprojects {
         jreTools = ['java', 'jjs', 'keytool', 'orbd', 'pack200', 'policytool', 'rmid', 'rmiregistry',
                     'servertool', 'tnameserv', 'unpack200']
 
+        configurationFiles = [
+            "jre/lib/calendars.properties",
+            "jre/lib/logging.properties",
+            "jre/lib/net.properties",
+            "jre/lib/security/policy/limited/local_policy.jar",
+            "jre/lib/security/policy/limited/US_export_policy.jar",
+            "jre/lib/security/policy/unlimited/local_policy.jar",
+            "jre/lib/security/policy/unlimited/US_export_policy.jar",
+            "jre/lib/security/blacklisted.certs",
+            "jre/lib/security/java.policy",
+            "jre/lib/security/java.security"
+        ];
+
         def milestone = project.findProperty("corretto.milestone") ?: "fcs"
         correttoCommonFlags = [
                 "--with-update-version=${project.version.update}",
@@ -212,4 +225,3 @@ project(':openjdksrc') {
         archives sourceDistributionTarball
     }
 }
-
diff --git a/installers/linux/al2/spec/java-1.8.0-amazon-corretto.spec.template b/installers/linux/al2/spec/java-1.8.0-amazon-corretto.spec.template
@@ -258,9 +258,20 @@ fi
 %endif
 
 %files
+%config(noreplace) %{java_home}/jre/lib/calendars.properties
+%config(noreplace) %{java_home}/jre/lib/logging.properties
+%config(noreplace) %{java_home}/jre/lib/net.properties
+%config(noreplace) %{java_home}/jre/lib/security/policy/limited/local_policy.jar
+%config(noreplace) %{java_home}/jre/lib/security/policy/limited/US_export_policy.jar
+%config(noreplace) %{java_home}/jre/lib/security/policy/unlimited/local_policy.jar
+%config(noreplace) %{java_home}/jre/lib/security/policy/unlimited/US_export_policy.jar
+%config(noreplace) %{java_home}/jre/lib/security/blacklisted.certs
+%config(noreplace) %{java_home}/jre/lib/security/java.policy
+%config(noreplace) %{java_home}/jre/lib/security/java.security
 %{java_home}/jre/ASSEMBLY_EXCEPTION
 %{java_home}/jre/LICENSE
 %{java_home}/jre/THIRD_PARTY_README
+
 %{java_home}/jre/bin
 %{java_home}/jre/lib
 

diff --git a/installers/linux/universal/deb/build.gradle b/installers/linux/universal/deb/build.gradle
@@ -178,11 +178,19 @@ task generateJdkDeb(type: Deb) {
     provides('java8-runtime-headless')
 
     from(jdkBinaryDir) {
+        include(project.configurationFiles)
+        // Deb actually uses configuationFile and not fileType see https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/118#issuecomment-656004360
+        // Path must be the fully qualified install path
+        configurationFile = project.configurationFiles.collect{ "${jdkHome}/${it}" }.join("\n")
         into jdkHome
+    }
+    from(jdkBinaryDir) {
+        into jdkHome
+        exclude(project.configurationFiles)
         createDirectoryEntry = true
     }
 
-    from("$buildRoot/jinfo") {
+    from("${buildRoot}/jinfo") {
         include '**/*.jinfo'
         into jvmDir
     }

diff --git a/installers/linux/universal/rpm/build.gradle b/installers/linux/universal/rpm/build.gradle
@@ -131,12 +131,18 @@ task generateJdkRpm(type: Rpm) {
     provides('java-sdk-openjdk ', "${epoch}:${project.version.full}", EQUAL)
 
     from(jdkBinaryDir) {
+        include(project.configurationFiles)
+        fileType CONFIG | NOREPLACE
         into jdkHome
+    }
+
+    from(jdkBinaryDir) {
+        into jdkHome
+        exclude(project.configurationFiles)
         createDirectoryEntry = true
     }
 }
 
 artifacts {
     archives generateJdkRpm
 }
-