diff options
| author | Zach van Rijn <me@zv.io> | 2023-11-03 15:19:30 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2023-11-03 15:40:33 +0000 |
| commit | e2e72fc2d41235272385e7e4760ca6dbd2173206 (patch) | |
| tree | 804ad1779b891be1a70755edd82fa13458426636 /user/spack/APKBUILD | |
| parent | 923b43dc23b518654b328d38a74af7394144979c (diff) | |
| download | packages-e2e72fc2d41235272385e7e4760ca6dbd2173206.tar.gz packages-e2e72fc2d41235272385e7e4760ca6dbd2173206.tar.bz2 packages-e2e72fc2d41235272385e7e4760ca6dbd2173206.tar.xz packages-e2e72fc2d41235272385e7e4760ca6dbd2173206.zip | |
user/spack: relocate default configuration. fixes #1108.
Switching to a file-based (as opposed to patch-based)
configuration will be easier for us to maintain. Note
that '/opt/spack/etc/spack/config.yaml' will override
values in '/etc/spack/config.yaml'.
Also:
* change upstream spack.git provider; fixes spack#8,
which gives users immediate access to our patches
if they wish to set up a separate Spack tree
Diffstat (limited to 'user/spack/APKBUILD')
| -rw-r--r-- | user/spack/APKBUILD | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/user/spack/APKBUILD b/user/spack/APKBUILD index 527429459..265d5fb17 100644 --- a/user/spack/APKBUILD +++ b/user/spack/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=spack pkgver=0.20.3_p1 -pkgrel=3 +pkgrel=4 pkgdesc="A flexible package manager for supercomputers." url="https://spack.io/" arch="all" @@ -22,7 +22,9 @@ source="https://git.adelielinux.org/adelie/$pkgname/-/archive/adelie-v$pkgver/$p archspec-fix-cpu-family-detection.patch default-no-buildcache.patch - default-config-unprivileged.patch + default-adelie-upstream-git.patch + + config.yaml " install="$pkgname.post-install" builddir="${srcdir}/${pkgname}-adelie-v${pkgver}" @@ -61,6 +63,9 @@ package() { for k in LICENSE-APACHE LICENSE-MIT NOTICE; do install -Dm644 ${k} "${pkgdir}"/usr/share/licenses/${pkgname}/${k}; done + + # lower precedence than /opt/spack/etc/spack/config.yaml + install -D -m644 "${srcdir}"/config.yaml "$pkgdir"/etc/spack/config.yaml; } sha512sums="9629ee48d4f93158c4c2d3f14bc8755e33df1a82428337fc27495b7bbfba3f056c193b95bcb9f90025d89c7759fcf2ef09a1f1639880a8db87a786ee1bd138e2 spack-adelie-v0.20.3_p1.tar.bz2 @@ -68,4 +73,5 @@ sha512sums="9629ee48d4f93158c4c2d3f14bc8755e33df1a82428337fc27495b7bbfba3f056c19 30f6d193971bc6f2941141d0da50d339c459f2b9c6157cc2659a589bd2b546fba35d580cad79dd1bc74bcd9de7db31bc937418598d73b68c69876fee6a1c5c73 clingo-explicit-libatomic.patch a6503238d116b74ff9c4ecd08a984df90ce02f95c3e10e907481d99917c73339db1cc49f2b473a37875b92a9a6607cac72057c0a7b3d9a57d44c89ebe0ad3915 archspec-fix-cpu-family-detection.patch eec3e7dd818c39daea7b8d63b04a6c71d9eb3af32dd899cddc3642152252f4e2eebfd53c3c95365117f9a4826f6f29553f44373948e5c474388021302c8a5ce9 default-no-buildcache.patch -4d138a4e04ab7367b9c3fe230342f5a1f449509cea26a62ddceb52ac516b1f2c420456e9675df79c6814dbcd423bcae96c8512ecaa795798a21e7b9483624d46 default-config-unprivileged.patch" +eb09ce82d2c5c63c2cc63b2f82db2888f15ce82100311614f5a73773be2f605337811c4580e0d4eb2f87b730e7ce4afa6dcdc3f3f52321f63a29a2ad533ea5d4 default-adelie-upstream-git.patch +864ae8e73cd80560ed9c4ce03bc6ae8f58b928da348a261617e42b6a680f8cf18f48b120401fe7b4a3f3af260675922044dbd9abbc79b1d2e90f821c00569d5e config.yaml" |