Remove pax_global_header

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Dec 9, 2020 · e5af378 · e5af378
1 parent d845de1
commit e5af378
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 41 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -33,44 +33,44 @@
   #########
   roles:
     - Debug
-#    - role: Get_Vendor_Files
-#      tags: [vendor_files, adoptopenjdk]
-#    - Version
-#    - Common
-#    - Windows_Updates
-#    - WMF_5.1
-#    - Jenkins                     # AdoptOpenJDK infrastructure
-#    - CodesignCert
-#    - MSVS_2010
-#    - VS2010_SP1
-#    - 7-Zip                       # Mostly extracting other prereqs :-)
-#    - cygwin
-#    - Firefox
-#    - Strawberry_Perl             # Testing
-#    - Freemarker                  # OpenJ9
-#    - cmake                       # OpenJ9
-#    - GIT
-#    - Java7                       # JDK8 build bootstrap
-#    - Java8                       # JDK9 build bootstrap/ For Gradle
-#    - role: Java_install          # JDK11 build bootstrap
-#      jdk_version: 10
-#    - role: Java_install          # For Gradle
-#      jdk_version: 11
-#    - role: Java_install          # JDK14 build bootstrap
-#      jdk_version: 13
-#    - role: Java_install          # JDK15 build bootstrap
-#      jdk_version: 14
-#    - ANT                         # Testing
-#    - MSVS_2013
-#    - MSVS_2017                   # OpenJ9
-#    - MSVS_2019                   # OpenJ9
-#    - NVidia_Cuda_Toolkit         # OpenJ9
-#    - NTP_TIME
-#    - Clang_64bit                 # OpenJ9
-#    - Clang_32bit                 # OpenJ9
-#    - nasm                        # OpenJ9
+    - role: Get_Vendor_Files
+      tags: [vendor_files, adoptopenjdk]
+    - Version
+    - Common
+    - Windows_Updates
+    - WMF_5.1
+    - Jenkins                     # AdoptOpenJDK infrastructure
+    - CodesignCert
+    - MSVS_2010
+    - VS2010_SP1
+    - 7-Zip                       # Mostly extracting other prereqs :-)
+    - cygwin
+    - Firefox
+    - Strawberry_Perl             # Testing
+    - Freemarker                  # OpenJ9
+    - cmake                       # OpenJ9
+    - GIT
+    - Java7                       # JDK8 build bootstrap
+    - Java8                       # JDK9 build bootstrap/ For Gradle
+    - role: Java_install          # JDK11 build bootstrap
+      jdk_version: 10
+    - role: Java_install          # For Gradle
+      jdk_version: 11
+    - role: Java_install          # JDK14 build bootstrap
+      jdk_version: 13
+    - role: Java_install          # JDK15 build bootstrap
+      jdk_version: 14
+    - ANT                         # Testing
+    - MSVS_2013
+    - MSVS_2017                   # OpenJ9
+    - MSVS_2019                   # OpenJ9
+    - NVidia_Cuda_Toolkit         # OpenJ9
+    - NTP_TIME
+    - Clang_64bit                 # OpenJ9
+    - Clang_32bit                 # OpenJ9
+    - nasm                        # OpenJ9
     - OpenSSL                     # OpenJ9
-#    - Rust                        # IcedTea-Web
-#    - IcedTea-Web                 # For Jenkins webstart
-#    - WiX                         # For creating installers
-#    - shortNames
+    - Rust                        # IcedTea-Web
+    - IcedTea-Web                 # For Jenkins webstart
+    - WiX                         # For creating installers
+    - shortNames
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/OpenSSL/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/OpenSSL/tasks/main.yml
@@ -49,11 +49,14 @@
   when: (not openssl32_installed.stat.exists) or (not openssl64_vs2013_installed.stat.exists) or (not openssl64_vs2017_installed.stat.exists) or (not openssl64_vs2019_installed.stat.exists)
   tags: openssl
 
+# Note: -aos tells it to ignore any existing pax-global_header file that is extracted
+# Can probably be removed after the version with del pax_global_header is run everywhere
 - name: Unpack OpenSSL-{{ opensslVersion }} for installation
   win_shell: |
     cd C:\temp
     C:\7-Zip\7z.exe x C:\temp\OpenSSL-{{ opensslVersion }}.tar.gz
-    C:\7-Zip\7z.exe x C:\temp\OpenSSL-{{ opensslVersion }}.tar
+    C:\7-Zip\7z.exe x -aos  C:\temp\OpenSSL-{{ opensslVersion }}.tar
+    del pax_global_header
   when: (not openssl32_installed.stat.exists) or (not openssl64_vs2013_installed.stat.exists) or (not openssl64_vs2017_installed.stat.exists) or (not openssl64_vs2019_installed.stat.exists)
   tags: openssl