49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
From a91079b55fa90142d9de03ffe219812a26937959 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Egbert Eich <eich@suse.com>
|
||
|
|
Date: Wed, 11 Jan 2023 14:30:19 +0100
|
||
|
|
Subject: [PATCH] Make spack paths compliant to distro installation
|
||
|
|
|
||
|
|
Spack is particular about the choice of 'prefix' which will
|
||
|
|
replace $spack. 'prefix' is the 4th ancestor of paths.py, so
|
||
|
|
it is relative to the spack installation.
|
||
|
|
This will only change the coded setups of
|
||
|
|
var_path -> /var/lib/spack
|
||
|
|
opt_path -> /opt/spack
|
||
|
|
repo_path -> /usr/share/spack/repos
|
||
|
|
|
||
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
||
|
|
Signed-off-by: Egbert Eich <eich@suse.de>
|
||
|
|
---
|
||
|
|
lib/spack/spack/paths.py | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/spack/spack/paths.py b/lib/spack/spack/paths.py
|
||
|
|
index 18656b76c2..f0e9cb587c 100644
|
||
|
|
--- a/lib/spack/spack/paths.py
|
||
|
|
+++ b/lib/spack/spack/paths.py
|
||
|
|
@@ -41,7 +41,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")
|
||
|
|
-opt_path = os.path.join(prefix, "opt")
|
||
|
|
+opt_path = os.path.join("/", "opt")
|
||
|
|
share_path = os.path.join(prefix, "share", "spack")
|
||
|
|
etc_path = os.path.join(prefix, "etc", "spack")
|
||
|
|
|
||
|
|
@@ -53,10 +53,10 @@
|
||
|
|
#
|
||
|
|
# Things in $spack/var/spack
|
||
|
|
#
|
||
|
|
-var_path = os.path.join(prefix, "var", "spack")
|
||
|
|
+var_path = os.path.join("/", "var", "lib", "spack")
|
||
|
|
|
||
|
|
# read-only things in $spack/var/spack
|
||
|
|
-repos_path = os.path.join(var_path, "repos")
|
||
|
|
+repos_path = os.path.join(share_path, "repos")
|
||
|
|
packages_path = os.path.join(repos_path, "builtin")
|
||
|
|
mock_packages_path = os.path.join(repos_path, "builtin.mock")
|
||
|
|
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|