Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cl 2023.06 20240124 #22

Closed
wants to merge 10 commits into from
1 change: 0 additions & 1 deletion ansible/playbooks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ Before running the playbook, make sure the following settings are correct, and o
| gentoo_git_repo | URL to the git repository of the (official) Gentoo ebuild repository |
| gentoo_git_commit | Git commit hash of the Gentoo ebuild repository to be used for the bootstrap |
| prefix_required_space | Minimal amount of disk space that is required for the Gentoo Prefix bootstrap |
| 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 |
Expand Down
7 changes: 3 additions & 4 deletions ansible/playbooks/roles/compatibility_layer/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ eessi_version: "2023.06"
custom_overlays:
- name: eessi
source: git
url: https://github.com/eessi/gentoo-overlay.git
url: https://github.com/EESSI/gentoo-overlay.git
eclass-overrides: true

cvmfs_repository: pilot.eessi-hpc.org
Expand All @@ -21,13 +21,12 @@ gentoo_git_repo: https://github.com/gentoo/gentoo.git
# June 8 (aab8473aa90e0287553b3348a5c5b17872df4b7b) commit that was current when fetching luaposix
gentoo_git_commit: aab8473aa90e0287553b3348a5c5b17872df4b7b
prefix_required_space: 15 GB
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: |
# stick to GCC 9.x; using a too recent compiler in the compat layer complicates stuff in the software layer,
# 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-10
>=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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,3 @@
state: present
with_items: "{{ prefix_locales }}"
notify: Generate locales

# Set default compiler in compat layer.
# We should not use the latest version of GCC here, since that will probably cause problems
# when building older GCC versions with EasyBuild in the software layer.
# (see https://github.com/EESSI/software-layer/issues/151).
# Note: the selected GCC version must be installed (cfr. EESSI set in gentoo-overlay)
- name: Make specific GCC version the default compiler
ansible.builtin.command: "{{ gentoo_prefix_path }}/usr/bin/gcc-config {{ prefix_default_gcc }}"
changed_when: false
Loading
Loading