Update to 2023.03

ansible/playbooks/README.md

@@ -41,6 +41,7 @@ Before running the playbook, make sure the following settings are correct, and o
 | prefix_default_gcc | GCC compiler version to use as default compiler in Gentoo Prefix installation |
 | prefix_user_defined_trusted_dirs | List of paths to the user defined trusted dirs for glibc |
 | prefix_mask_packages | Contents of a [package.mask file](https://wiki.gentoo.org/wiki//etc/portage/package.mask) that should be used during the bootstrap |
+| prefix_unmask_packages | Contents of a [package.unmask file](https://wiki.gentoo.org/wiki//etc/portage/package.unmask) that should be used during the bootstrap |
 | prefix_bootstrap_use_flags | Contents of [package.use file](https://wiki.gentoo.org/wiki//etc/portage/package.use) to put in place after bootstrap stage 3 |
 | prefix_use_builtin_bootstrap | Use the container's built-in bootstrap script? |
 | prefix_custom_bootstrap_script | Dictionary with the `local` source and `remote` destination of the bootstrap script |

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

@@ -1,6 +1,6 @@
 # Defaults file for the compatibility layer role.
 ---
-eessi_version: "2021.12"
+eessi_version: "2023.03"
 
 custom_overlays:
   - name: eessi
@@ -16,21 +16,18 @@ 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
-gentoo_git_commit: 7eaa2512d1e6ddb44e3b41bbddf6c74723f234ce
+gentoo_git_commit: 4ca74e7abe4f2b14e686267b517c59d43bb580b4
 prefix_required_space: 15 GB
-prefix_default_gcc: 9.4.0
+prefix_default_gcc: 9.5.0
 prefix_user_defined_trusted_dirs:
   - "/cvmfs/{{ cvmfs_repository }}/host_injections/{{ eessi_version }}/compat/{{ eessi_host_os }}/{{ eessi_host_arch }}/lib"
 prefix_mask_packages: |
-  # avoid glibc 2.34, as it's causing issues with the bootstrap, and it's not compatible with CUDA 11.
-  # see https://github.com/EESSI/compatibility-layer/issues/137 + https://bugs.gentoo.org/824482
-  >=sys-libs/glibc-2.34
   # stick to GCC 9.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-10
-  # avoid libgcrypt 1.9.4 due to compiler errros on ppc64le,
-  # see https://github.com/EESSI/compatibility-layer/issues/134 + https://bugs.gentoo.org/825722
-  =dev-libs/libgcrypt-1.9.4
+prefix_unmask_packages: |
+  # unmask older GCC to make it installable
+  =sys-devel/gcc-9*
 prefix_bootstrap_use_flags: |
   # make sure that gold linker is installed with binutils
   sys-devel/binutils gold

ansible/playbooks/roles/compatibility_layer/tasks/install_prefix.yml

@@ -41,7 +41,6 @@
     path: "{{ gentoo_prefix_path }}/etc/portage/repos.conf"
     state: directory
     mode: 0755
-  when: prefix_mask_packages is defined and prefix_mask_packages | length > 0
   tags:
     - build_prefix
 
@@ -145,6 +144,15 @@
   tags:
     - build_prefix
 
+- name: "Unmask packages for the bootstrap"
+  ansible.builtin.copy:
+    dest: "{{ gentoo_prefix_path }}/etc/portage/package.unmask"
+    content: "{{ prefix_unmask_packages }}"
+    mode: 0644
+  when: prefix_unmask_packages is defined and prefix_unmask_packages | length > 0
+  tags:
+    - build_prefix
+
 - name: "Run Gentoo Prefix bootstrap stages 1-3 via {{ prefix_install }}"
   ansible.builtin.shell: set -o pipefail && ( {{ prefix_install }} | tee -a {{ prefix_build_log }} | grep -E '^(>>> Installing|\\* )' )
   become: false