RISC-V compatibility layer 20240402

ansible/playbooks/roles/compatibility_layer/defaults/main.yml

@@ -1,6 +1,6 @@
 # Defaults file for the compatibility layer role.
 ---
-eessi_version: "2023.06"
+eessi_version: "20240402"
 
 custom_overlays:
   - name: eessi
@@ -16,27 +16,27 @@ gentoo_prefix_path: /cvmfs/{{ cvmfs_repository }}/versions/{{ eessi_version }}/c
 gentoo_git_repo: https://github.com/gentoo/gentoo.git
 # Select a specific commit in the gentoo_git_repo that should be used for the bootstrap,
 # e.g. by checking: https://github.com/gentoo/gentoo/commits/master
-# April 17 (29492845e41ea6a0a4a9769c7e0ce287d106079b) commit is after fix for Lmod
-# gentoo_git_commit: 29492845e41ea6a0a4a9769c7e0ce287d106079b
-# June 8 (aab8473aa90e0287553b3348a5c5b17872df4b7b) commit that was current when fetching luaposix
-gentoo_git_commit: aab8473aa90e0287553b3348a5c5b17872df4b7b
+# March 7: latest commit (includes a RISC-V fix for GCC)
+gentoo_git_commit: 67abd4f05d32aa8ed4246afb5a165eed8a38dbfe
 prefix_required_space: 15 GB
 prefix_user_defined_trusted_dirs:
   - "/cvmfs/{{ cvmfs_repository }}/host_injections/{{ eessi_version }}/compat/{{ eessi_host_os }}/{{ eessi_host_arch }}/lib"
 prefix_mask_packages: |
   # stick to GCC 10.x; using a too recent compiler in the compat layer complicates stuff in the software layer,
   # see for example https://github.com/EESSI/software-layer/issues/151
-  >=sys-devel/gcc-11
+  # for RISC-V we do need a more recent compiler, so we don't mask the recent versions
+  #>=sys-devel/gcc-11
   # mask OpenSSL 3.x, stick to OpenSSL 1.1.x for now to avoid problems with:
   # - older versions of Rust (see https://github.com/EESSI/software-layer/issues/257)
   # - older versions of cryptograhy in Python (see https://github.com/EESSI/software-layer/issues/258)
   >=dev-libs/openssl-3
 prefix_unmask_packages: |
-  # unmask older GCC to make it installable
-  =sys-devel/gcc-9*
+  # unmask older OpenSSL to make it installable
+  =dev-libs/openssl-1.1.1w
 prefix_bootstrap_use_flags: |
   # make sure that gold linker is installed with binutils
-  sys-devel/binutils gold
+  # the gold linker is not supported on RISC-V
+  # sys-devel/binutils gold
   # only install Python 3.11
   */* PYTHON_TARGETS: -* python3_11
   */* PYTHON_SINGLE_TARGET: -* python3_11
@@ -63,8 +63,10 @@ prefix_locales:
   - en_US.UTF-8 UTF-8
 
 # By default, we install an architecture-specific set
+# The one for RISC-V is still named 2023.06, so we need to hardcode that here
 package_sets:
-  - "eessi-{{ eessi_version }}-{{ eessi_host_os }}-{{ eessi_host_arch }}"
+  - "eessi-2023.06-{{ eessi_host_os }}-{{ eessi_host_arch }}"
+#  - "eessi-{{ eessi_version }}-{{ eessi_host_os }}-{{ eessi_host_arch }}"
 
 prefix_packages: