From 30448d44511b1cebd900b9c45291040bba12a01d Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 25 Jun 2026 17:09:04 +0200 Subject: [PATCH 1/2] rename dir to 5.21 --- recipes/fdb/{5.19 => 5.21}/compilers.yaml | 0 recipes/fdb/{5.19 => 5.21}/config.yaml | 0 recipes/fdb/{5.19 => 5.21}/environments.yaml | 0 recipes/fdb/{5.19 => 5.21}/meta/private/expand_language.py | 0 recipes/fdb/{5.19 => 5.21}/meta/private/expand_params.py | 0 .../fdb/{5.19 => 5.21}/meta/private/fdb_config/rea-l-ch1.schema | 0 recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/rea-l-ch1.yaml | 0 .../fdb/{5.19 => 5.21}/meta/private/fdb_config/realtime.schema | 0 recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/realtime.yaml | 0 .../fdb/{5.19 => 5.21}/meta/private/fdb_config/remote-depl.yaml | 0 .../fdb/{5.19 => 5.21}/meta/private/fdb_config/remote-devt.yaml | 0 recipes/fdb/{5.19 => 5.21}/meta/private/pyproject.toml | 0 recipes/fdb/{5.19 => 5.21}/meta/private/uenv_param_map.py | 0 recipes/fdb/{5.19 => 5.21}/packages.yaml | 0 recipes/fdb/{5.19 => 5.21}/post-install | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/ecbuild/package.py | 0 .../repo/packages/eccodes/cmake_install_rpath.patch | 0 .../{5.19 => 5.21}/repo/packages/eccodes/openjpeg_jasper.patch | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/eccodes/package.py | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/eckit/package.py | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/fdb/metkit_1.7.0.patch | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/fdb/package.py | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/gribjump/package.py | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/libaec/package.py | 0 recipes/fdb/{5.19 => 5.21}/repo/packages/metkit/package.py | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename recipes/fdb/{5.19 => 5.21}/compilers.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/config.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/environments.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/expand_language.py (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/expand_params.py (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/rea-l-ch1.schema (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/rea-l-ch1.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/realtime.schema (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/realtime.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/remote-depl.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/fdb_config/remote-devt.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/pyproject.toml (100%) rename recipes/fdb/{5.19 => 5.21}/meta/private/uenv_param_map.py (100%) rename recipes/fdb/{5.19 => 5.21}/packages.yaml (100%) rename recipes/fdb/{5.19 => 5.21}/post-install (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/ecbuild/package.py (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/eccodes/cmake_install_rpath.patch (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/eccodes/openjpeg_jasper.patch (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/eccodes/package.py (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/eckit/package.py (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/fdb/metkit_1.7.0.patch (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/fdb/package.py (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/gribjump/package.py (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/libaec/package.py (100%) rename recipes/fdb/{5.19 => 5.21}/repo/packages/metkit/package.py (100%) diff --git a/recipes/fdb/5.19/compilers.yaml b/recipes/fdb/5.21/compilers.yaml similarity index 100% rename from recipes/fdb/5.19/compilers.yaml rename to recipes/fdb/5.21/compilers.yaml diff --git a/recipes/fdb/5.19/config.yaml b/recipes/fdb/5.21/config.yaml similarity index 100% rename from recipes/fdb/5.19/config.yaml rename to recipes/fdb/5.21/config.yaml diff --git a/recipes/fdb/5.19/environments.yaml b/recipes/fdb/5.21/environments.yaml similarity index 100% rename from recipes/fdb/5.19/environments.yaml rename to recipes/fdb/5.21/environments.yaml diff --git a/recipes/fdb/5.19/meta/private/expand_language.py b/recipes/fdb/5.21/meta/private/expand_language.py similarity index 100% rename from recipes/fdb/5.19/meta/private/expand_language.py rename to recipes/fdb/5.21/meta/private/expand_language.py diff --git a/recipes/fdb/5.19/meta/private/expand_params.py b/recipes/fdb/5.21/meta/private/expand_params.py similarity index 100% rename from recipes/fdb/5.19/meta/private/expand_params.py rename to recipes/fdb/5.21/meta/private/expand_params.py diff --git a/recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.schema b/recipes/fdb/5.21/meta/private/fdb_config/rea-l-ch1.schema similarity index 100% rename from recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.schema rename to recipes/fdb/5.21/meta/private/fdb_config/rea-l-ch1.schema diff --git a/recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.yaml b/recipes/fdb/5.21/meta/private/fdb_config/rea-l-ch1.yaml similarity index 100% rename from recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.yaml rename to recipes/fdb/5.21/meta/private/fdb_config/rea-l-ch1.yaml diff --git a/recipes/fdb/5.19/meta/private/fdb_config/realtime.schema b/recipes/fdb/5.21/meta/private/fdb_config/realtime.schema similarity index 100% rename from recipes/fdb/5.19/meta/private/fdb_config/realtime.schema rename to recipes/fdb/5.21/meta/private/fdb_config/realtime.schema diff --git a/recipes/fdb/5.19/meta/private/fdb_config/realtime.yaml b/recipes/fdb/5.21/meta/private/fdb_config/realtime.yaml similarity index 100% rename from recipes/fdb/5.19/meta/private/fdb_config/realtime.yaml rename to recipes/fdb/5.21/meta/private/fdb_config/realtime.yaml diff --git a/recipes/fdb/5.19/meta/private/fdb_config/remote-depl.yaml b/recipes/fdb/5.21/meta/private/fdb_config/remote-depl.yaml similarity index 100% rename from recipes/fdb/5.19/meta/private/fdb_config/remote-depl.yaml rename to recipes/fdb/5.21/meta/private/fdb_config/remote-depl.yaml diff --git a/recipes/fdb/5.19/meta/private/fdb_config/remote-devt.yaml b/recipes/fdb/5.21/meta/private/fdb_config/remote-devt.yaml similarity index 100% rename from recipes/fdb/5.19/meta/private/fdb_config/remote-devt.yaml rename to recipes/fdb/5.21/meta/private/fdb_config/remote-devt.yaml diff --git a/recipes/fdb/5.19/meta/private/pyproject.toml b/recipes/fdb/5.21/meta/private/pyproject.toml similarity index 100% rename from recipes/fdb/5.19/meta/private/pyproject.toml rename to recipes/fdb/5.21/meta/private/pyproject.toml diff --git a/recipes/fdb/5.19/meta/private/uenv_param_map.py b/recipes/fdb/5.21/meta/private/uenv_param_map.py similarity index 100% rename from recipes/fdb/5.19/meta/private/uenv_param_map.py rename to recipes/fdb/5.21/meta/private/uenv_param_map.py diff --git a/recipes/fdb/5.19/packages.yaml b/recipes/fdb/5.21/packages.yaml similarity index 100% rename from recipes/fdb/5.19/packages.yaml rename to recipes/fdb/5.21/packages.yaml diff --git a/recipes/fdb/5.19/post-install b/recipes/fdb/5.21/post-install similarity index 100% rename from recipes/fdb/5.19/post-install rename to recipes/fdb/5.21/post-install diff --git a/recipes/fdb/5.19/repo/packages/ecbuild/package.py b/recipes/fdb/5.21/repo/packages/ecbuild/package.py similarity index 100% rename from recipes/fdb/5.19/repo/packages/ecbuild/package.py rename to recipes/fdb/5.21/repo/packages/ecbuild/package.py diff --git a/recipes/fdb/5.19/repo/packages/eccodes/cmake_install_rpath.patch b/recipes/fdb/5.21/repo/packages/eccodes/cmake_install_rpath.patch similarity index 100% rename from recipes/fdb/5.19/repo/packages/eccodes/cmake_install_rpath.patch rename to recipes/fdb/5.21/repo/packages/eccodes/cmake_install_rpath.patch diff --git a/recipes/fdb/5.19/repo/packages/eccodes/openjpeg_jasper.patch b/recipes/fdb/5.21/repo/packages/eccodes/openjpeg_jasper.patch similarity index 100% rename from recipes/fdb/5.19/repo/packages/eccodes/openjpeg_jasper.patch rename to recipes/fdb/5.21/repo/packages/eccodes/openjpeg_jasper.patch diff --git a/recipes/fdb/5.19/repo/packages/eccodes/package.py b/recipes/fdb/5.21/repo/packages/eccodes/package.py similarity index 100% rename from recipes/fdb/5.19/repo/packages/eccodes/package.py rename to recipes/fdb/5.21/repo/packages/eccodes/package.py diff --git a/recipes/fdb/5.19/repo/packages/eckit/package.py b/recipes/fdb/5.21/repo/packages/eckit/package.py similarity index 100% rename from recipes/fdb/5.19/repo/packages/eckit/package.py rename to recipes/fdb/5.21/repo/packages/eckit/package.py diff --git a/recipes/fdb/5.19/repo/packages/fdb/metkit_1.7.0.patch b/recipes/fdb/5.21/repo/packages/fdb/metkit_1.7.0.patch similarity index 100% rename from recipes/fdb/5.19/repo/packages/fdb/metkit_1.7.0.patch rename to recipes/fdb/5.21/repo/packages/fdb/metkit_1.7.0.patch diff --git a/recipes/fdb/5.19/repo/packages/fdb/package.py b/recipes/fdb/5.21/repo/packages/fdb/package.py similarity index 100% rename from recipes/fdb/5.19/repo/packages/fdb/package.py rename to recipes/fdb/5.21/repo/packages/fdb/package.py diff --git a/recipes/fdb/5.19/repo/packages/gribjump/package.py b/recipes/fdb/5.21/repo/packages/gribjump/package.py similarity index 100% rename from recipes/fdb/5.19/repo/packages/gribjump/package.py rename to recipes/fdb/5.21/repo/packages/gribjump/package.py diff --git a/recipes/fdb/5.19/repo/packages/libaec/package.py b/recipes/fdb/5.21/repo/packages/libaec/package.py similarity index 100% rename from recipes/fdb/5.19/repo/packages/libaec/package.py rename to recipes/fdb/5.21/repo/packages/libaec/package.py diff --git a/recipes/fdb/5.19/repo/packages/metkit/package.py b/recipes/fdb/5.21/repo/packages/metkit/package.py similarity index 100% rename from recipes/fdb/5.19/repo/packages/metkit/package.py rename to recipes/fdb/5.21/repo/packages/metkit/package.py From bad719d4a6f183a0d49fc9a32c122141195d9b0e Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 25 Jun 2026 17:36:23 +0200 Subject: [PATCH 2/2] [WIP] update spack stack --- recipes/fdb/5.21/config.yaml | 4 ++-- recipes/fdb/5.21/environments.yaml | 10 +++++----- recipes/fdb/5.21/repo/packages/eccodes/package.py | 1 + recipes/fdb/5.21/repo/packages/eckit/package.py | 1 + recipes/fdb/5.21/repo/packages/fdb/package.py | 1 + recipes/fdb/5.21/repo/packages/gribjump/package.py | 1 + recipes/fdb/5.21/repo/packages/metkit/package.py | 4 ++++ 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/recipes/fdb/5.21/config.yaml b/recipes/fdb/5.21/config.yaml index 763892a5..df57363c 100644 --- a/recipes/fdb/5.21/config.yaml +++ b/recipes/fdb/5.21/config.yaml @@ -2,9 +2,9 @@ name: fdb store: /user-environment spack: repo: https://github.com/spack/spack.git - commit: releases/v1.1 + commit: v1.2.0 packages: repo: https://github.com/spack/spack-packages.git - commit: v2026.03.0 + commit: v2026.06.0 description: MCH FDB uenv version: 2 diff --git a/recipes/fdb/5.21/environments.yaml b/recipes/fdb/5.21/environments.yaml index d161412a..82872c16 100644 --- a/recipes/fdb/5.21/environments.yaml +++ b/recipes/fdb/5.21/environments.yaml @@ -3,11 +3,11 @@ fdb: unify: when_possible packages: [] specs: - - fdb@=5.19.2 backends=lustre - - gribjump@=0.10.3 - - eckit@=2.0.2 linalg=none compression=lz4 +curl +ssl - - metkit@=1.16.3-levelist - - eccodes@=2.46.0 jp2k=none ~fortran +pthreads +aec +geo + - fdb@=5.21.4 backends=lustre + - gribjump@=0.12.0 + - eckit@=2.0.8 linalg=none compression=lz4 +curl +ssl + - metkit@=1.18.3-levelist + - eccodes@=2.47.0 jp2k=none ~fortran +pthreads +aec +geo # TODO: 2.47.2 - ecbuild@=3.13.1 - python@=3.11.15 variants: diff --git a/recipes/fdb/5.21/repo/packages/eccodes/package.py b/recipes/fdb/5.21/repo/packages/eccodes/package.py index 3006a777..ea8476ef 100644 --- a/recipes/fdb/5.21/repo/packages/eccodes/package.py +++ b/recipes/fdb/5.21/repo/packages/eccodes/package.py @@ -51,6 +51,7 @@ class Eccodes(CMakePackage): version("develop", branch="develop") + version("2.47.0", sha256="82da819aa9b51831dc14b3bf2918bfee50b1cd53a05088d0c3f4493758aae094") version("2.46.0", sha256="7d959253d5e34aeb16caa14d4889ac06486d19821216743142733a32ee7b4935") version("2.45.0", sha256="6c84b39d7cc5e3b8330eeabe880f3e337f9b2ee1ebce20ea03eecd785f6c39a1") version("2.42.0", sha256="60371b357cb011dee546db2eabace5b7e27f0f87d3ea4a5adde7891371b3c128") diff --git a/recipes/fdb/5.21/repo/packages/eckit/package.py b/recipes/fdb/5.21/repo/packages/eckit/package.py index cf433a1a..0866fcc8 100644 --- a/recipes/fdb/5.21/repo/packages/eckit/package.py +++ b/recipes/fdb/5.21/repo/packages/eckit/package.py @@ -22,6 +22,7 @@ class Eckit(CMakePackage): license("Apache-2.0") + version("2.0.8", sha256="b85120d4d9f8440d763f5ed34ccb92b24663a5c72988f7ef9a107ba7a5439cc5") version("2.0.2", sha256="46b9c1f90e0b565698c5c79c54676401d33738ec82995c025d5d5aabeb13ad2b") version("1.33.0", sha256="a15f89df0cdaa2d8a74843a1e72a7b3b304958a4fe119b51eec5efadbf113d4f") version("1.32.3", sha256="33e0fac2656cdd2f2d877dbfe7a4751ee657ab732c00dd90bd48a406298a100f") diff --git a/recipes/fdb/5.21/repo/packages/fdb/package.py b/recipes/fdb/5.21/repo/packages/fdb/package.py index b579a9a6..875e78cb 100644 --- a/recipes/fdb/5.21/repo/packages/fdb/package.py +++ b/recipes/fdb/5.21/repo/packages/fdb/package.py @@ -22,6 +22,7 @@ class Fdb(CMakePackage): version("master", branch="master") + version("5.21.4", sha256="9751a5a9a3e1b29a8237fc1ae716b11e7e12f70fe73a8e343587e54247caf251") version("5.19.2", sha256="7dfffd7279a53431fe11a82b5c6dcc94f42bc5100a0ff925fe0b54de94d1cfe2") version("5.19.1", sha256="de5edddd4c17cb4ddfe61bfed60a6b37408d5ed92a2d19a493592e1abfe65a8d") version("5.19.0", sha256="1275c4b89dcdfcb342a255e22a7d500070d5d32251910c4c2a10d5734c0590eb") diff --git a/recipes/fdb/5.21/repo/packages/gribjump/package.py b/recipes/fdb/5.21/repo/packages/gribjump/package.py index 948bbd8c..1e6ed232 100644 --- a/recipes/fdb/5.21/repo/packages/gribjump/package.py +++ b/recipes/fdb/5.21/repo/packages/gribjump/package.py @@ -21,6 +21,7 @@ class Gribjump(CMakePackage): license("Apache-2.0") + version("0.12.0", sha256="a271af93e871a051585c6c0df60c93c0e79442e552187527391e9378aeb5992f") version("0.10.3", sha256="8001f8a0e4b03664134ea42612d22d6499e098d2063b12182030986895689f6c") version("0.10.2", sha256="c1635c1f902daa244592b60c9b1a81375b467409635bd2cbfc6993d32554bd3d") version("0.10.0", sha256="04a6c7322e585acb7e432e74d68f073ab584a42af9dcb2b4b97f17aebf17d07f") diff --git a/recipes/fdb/5.21/repo/packages/metkit/package.py b/recipes/fdb/5.21/repo/packages/metkit/package.py index cb8857ea..a9b02bca 100644 --- a/recipes/fdb/5.21/repo/packages/metkit/package.py +++ b/recipes/fdb/5.21/repo/packages/metkit/package.py @@ -20,6 +20,10 @@ class Metkit(CMakePackage): license("Apache-2.0") + version( + "1.18.3-levelist", + sha256="47667e34e4e82b835d36352198e87bf1c804656acf9f0d42a260203badd57794" + ) version("1.17.0", sha256="0fb4cae8cf440f6589b426cbddf8fd37434bc59e178b34df6b7633bfdbb47de3") version( "1.16.3-levelist",