diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh index d8f3547655..67cafc9ebc 100755 --- a/ansible/pbTestScripts/buildJDK.sh +++ b/ansible/pbTestScripts/buildJDK.sh @@ -47,7 +47,6 @@ processArgs() { usage() { echo "Usage: ./buildJDK.sh - Options: --version | -v Specify the JDK version to build --fork | -f Specify the fork of openjdk-build to build from (Default: adoptopenjdk) @@ -55,7 +54,6 @@ usage() { --hotspot | -hs Builds hotspot, default is openj9 --clean-workspace | -c Removes old openjdk-build folder before cloning --help | -h Shows this message - If not specified, JDK8-J9 will be built with the standard openjdk-build repo" echo } @@ -173,7 +171,7 @@ fi export CONFIGURE_ARGS="--with-native-debug-symbols=none" export BUILD_ARGS="--custom-cacerts false" -# For Ubutu24.04 Support - Dont Use gcc-7 +# For Ubuntu24.04 Support - Don't Use gcc-7 if grep 'noble' /etc/*-release >/dev/null 2>&1; then export BUILD_ARGS="--custom-cacerts false --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03" fi diff --git a/ansible/pbTestScripts/vmDestroy.sh b/ansible/pbTestScripts/vmDestroy.sh index fba9bf2521..616b4bd3f7 100755 --- a/ansible/pbTestScripts/vmDestroy.sh +++ b/ansible/pbTestScripts/vmDestroy.sh @@ -49,8 +49,8 @@ checkOS() { osToDestroy="U21";; "Ubuntu2204" | "U22" | "u22" ) osToDestroy="U22";; - "Ubuntu2404" | "U24" | "u24" ) - osToDestroy="U24";; + "Ubuntu2404" | "U24" | "u24" ) + osToDestroy="U24";; "CentOS6" | "centos6" | "C6" | "c6" ) osToDestroy="C6" ;; "CentOS7" | "centos7" | "C7" | "c7" ) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/files/nasm_patch.patch b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/files/nasm_patch.patch deleted file mode 100644 index ed73a47252..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/files/nasm_patch.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5eb1838b4d3752fd863d19442943983a2a5ee87c Mon Sep 17 00:00:00 2001 -From: Cyrill Gorcunov -Date: Sat, 10 Feb 2018 00:33:41 +0300 -Subject: [PATCH] nasmlib: Drop unused seg_init - -The helper has been eliminated in 2c4a4d5810d0a59b033a07876a2648ef5d4c2859 - -https://bugzilla.nasm.us/show_bug.cgi?id=3392461 - -Signed-off-by: Cyrill Gorcunov ---- - include/nasmlib.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/include/nasmlib.h b/include/nasmlib.h -index 79e866b5..fee1b5ea 100644 ---- a/include/nasmlib.h -+++ b/include/nasmlib.h -@@ -188,10 +188,8 @@ int64_t readnum(char *str, bool *error); - int64_t readstrnum(char *str, int length, bool *warn); - - /* -- * seg_init: Initialise the segment-number allocator. - * seg_alloc: allocate a hitherto unused segment number. - */ --void pure_func seg_init(void); - int32_t pure_func seg_alloc(void); - - /* --- -2.17.0 diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml index f9c617ae15..dcdbff4cee 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml @@ -71,14 +71,14 @@ tags: nasm - name: Download nasm sources - shell: cd /tmp && wget https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz + shell: cd /tmp && wget https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.tar.gz when: - - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) + - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.16.03', operator='ne')) ) tags: nasm - name: Extract nasm sources unarchive: - src: /tmp/nasm-2.13.03.tar.gz + src: /tmp/nasm-2.16.03.tar.gz dest: /tmp/ copy: False when: @@ -86,7 +86,7 @@ tags: nasm - name: Running ./configure & make for nasm ( Not Ubuntu 22+ ) - shell: cd /tmp/nasm-2.13.03 && CC={{ CC }} && ./configure -prefix=/usr/local && make install + shell: cd /tmp/nasm-2.16.03 && CC={{ CC }} && ./configure -prefix=/usr/local && make install environment: CC: "{{ CC }}" when: @@ -94,7 +94,7 @@ tags: nasm - name: Running ./configure & make for nasm ( Ubuntu 22 x64 ) - shell: cd /tmp/nasm-2.13.03 && CC={{ CC }} && ./configure -prefix=/usr/local && make install + shell: cd /tmp/nasm-2.16.03 && CC={{ CC }} && ./configure -prefix=/usr/local && make install environment: CC: "{{ CC }}" LIBRARY_PATH: /usr/lib/x86_64-linux-gnu @@ -102,29 +102,12 @@ - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "22" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) tags: nasm -- name: Copy Nasm Patch ( Ubuntu 24+ ) - copy: - src: files/nasm_patch.patch - dest: /tmp/nasm-2.13.03 - owner: root - group: root - mode: 0755 - when: - - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version >= "24" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) - tags: nasm - -- name: Apply Patch For NASM ( Ubuntu 24+ x64 ) - shell: cd /tmp/nasm-2.13.03 && git apply nasm_patch.patch - when: - - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version >= "24" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) - tags: nasm - - name: Running ./configure & make for nasm ( Ubuntu 24+ x64 ) - shell: cd /tmp/nasm-2.13.03 && ./configure -prefix=/usr/local && make install + shell: cd /tmp/nasm-2.16.03 && ./configure -prefix=/usr/local && make install environment: LIBRARY_PATH: /usr/lib/x86_64-linux-gnu when: - - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version >= "24" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.13.03', operator='ne')) ) + - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version >= "24" and ansible_architecture == "x86_64") and (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare('2.16.03', operator='ne')) ) tags: nasm - name: Remove downloaded packages for nasm @@ -132,7 +115,7 @@ path: "{{ item }}" state: absent with_items: - - /tmp/nasm-2.13.03 - - /tmp/nasm-2.13.03.tar.gz + - /tmp/nasm-2.16.03 + - /tmp/nasm-2.16.03.tar.gz failed_when: false tags: nasm