From: Egbert Eich Date: Tue Sep 22 09:42:40 2020 +0200 Subject: Make spack paths compliant to distro installation Patch-mainline: Not yet Git-commit: 0e7934fd94b6f5ec2059b73d7b17b7e048d61b2d References: Signed-off-by: Egbert Eich --- etc/spack/defaults/config.yaml | 8 ++++---- etc/spack/defaults/repos.yaml | 2 +- lib/spack/spack/paths.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml index a572787..cbad1b7 100644 --- a/etc/spack/defaults/config.yaml +++ b/etc/spack/defaults/config.yaml @@ -21,7 +21,7 @@ config: # Locations where templates should be found template_dirs: - - $spack/share/spack/templates + - /usr/share/spack/templates # Default directory layout @@ -30,8 +30,8 @@ config: # Locations where different types of modules should be installed. module_roots: - tcl: $spack/share/spack/modules - lmod: $spack/share/spack/lmod + tcl: /usr/share/spack/modules + lmod: /usr/share/spack/lmod # Temporary locations Spack can try to use for builds. @@ -67,7 +67,7 @@ config: # Cache directory for already downloaded source tarballs and archived # repositories. This can be purged with `spack clean --downloads`. - source_cache: $spack/var/spack/cache + source_cache: /var/spack/cache # Cache directory for miscellaneous files, like the package index. diff --git a/etc/spack/defaults/repos.yaml b/etc/spack/defaults/repos.yaml index f3e0065..2469194 100644 --- a/etc/spack/defaults/repos.yaml +++ b/etc/spack/defaults/repos.yaml @@ -11,4 +11,4 @@ # ~/.spack/repos.yaml # ------------------------------------------------------------------------- repos: - - $spack/var/spack/repos/builtin + - /var/lib/spack/repos/builtin diff --git a/lib/spack/spack/paths.py b/lib/spack/spack/paths.py index e5541ef..bc8e49d 100644 --- a/lib/spack/spack/paths.py +++ b/lib/spack/spack/paths.py @@ -37,7 +37,7 @@ operating_system_path = os.path.join(module_path, 'operating_systems') test_path = os.path.join(module_path, "test") hooks_path = os.path.join(module_path, "hooks") -var_path = os.path.join(prefix, "var", "spack") +var_path = os.path.join("/", "var", "lib", "spack") repos_path = os.path.join(var_path, "repos") share_path = os.path.join(prefix, "share", "spack")