From a31bb54bf32fdf7da0178ec2a2459c4c8499b3da Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Wed, 21 Dec 2022 20:03:30 -0700
Subject: [PATCH 1/5] Add padded_length config option in
 configs/common/config.yaml for binary relocation

---
 configs/common/config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/common/config.yaml b/configs/common/config.yaml
index 603f0acec..a7fc90c1c 100644
--- a/configs/common/config.yaml
+++ b/configs/common/config.yaml
@@ -5,6 +5,8 @@ config:
     root: $env/install
     projections:
       all: "${COMPILERNAME}/${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"
+    # Needed for relocation of binary packages (build caches)
+    padded_length: true
 
   # The build stage can be purged with `spack clean --stage` and
   # `spack clean -a`, so it is important that the specified directory uniquely

From efd5ed59af3332bcefe59738b6b178c7a678968a Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Wed, 21 Dec 2022 20:04:16 -0700
Subject: [PATCH 2/5] Update .gitmodules and submodule pointer for spack for
 code review and testing

---
 .gitmodules | 10 ++++++----
 spack       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c92fbbc5e..407ca9141 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,11 @@
 [submodule "spack"]
   path = spack
-  #url = https://github.com/spack/spack
-  #branch = develop
-  url = https://github.com/NOAA-EMC/spack
-  branch = jcsda_emc_spack_stack
+  ##url = https://github.com/spack/spack
+  ##branch = develop
+  #url = https://github.com/NOAA-EMC/spack
+  #branch = jcsda_emc_spack_stack
+  url = https://github.com/climbfuji/spack
+  branch = feature/buildcaches_skip_on_error_fix_double_rpath
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules
diff --git a/spack b/spack
index 31715e396..494fd5d5b 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 31715e396dfb727092399b0617cb5a13a4063988
+Subproject commit 494fd5d5b1c9c8212d003d0aa4f081a0d8e64b83

From d9e9ab1635f9d34fd904830625c24a98d38924c5 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Fri, 24 Feb 2023 06:50:29 -0700
Subject: [PATCH 3/5] Update .gitmodules and submodule pointer for spack for
 code review and testing

---
 .gitmodules | 6 ++++--
 spack       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c92fbbc5e..bd510d8d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,8 +2,10 @@
   path = spack
   #url = https://github.com/spack/spack
   #branch = develop
-  url = https://github.com/NOAA-EMC/spack
-  branch = jcsda_emc_spack_stack
+  #url = https://github.com/NOAA-EMC/spack
+  #branch = jcsda_emc_spack_stack
+  url = https://github.com/climbfuji/spack
+  branch = feature/buildcaches
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules
diff --git a/spack b/spack
index 411280ccb..daf4a32cb 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 411280ccb83e37c1f8b022be11135fb4532ff71d
+Subproject commit daf4a32cb16923570b817e83f16854acb67fd2f6

From a770fc9769851c104f69b0e02d3e75445ad210bd Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Fri, 24 Feb 2023 07:13:18 -0700
Subject: [PATCH 4/5] Update submodule pointer for spack

---
 spack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spack b/spack
index daf4a32cb..7ed0fc6fb 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit daf4a32cb16923570b817e83f16854acb67fd2f6
+Subproject commit 7ed0fc6fb074937b6626550e588cfe38c5b3c419

From e1dea40a55d56ca27f54ea9e4b3c1f893f976a97 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Fri, 24 Feb 2023 19:03:43 -0700
Subject: [PATCH 5/5] Revert .gitmodules and update submodule pointer for spack

---
 .gitmodules | 6 ++----
 spack       | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index bd510d8d3..c92fbbc5e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,8 @@
   path = spack
   #url = https://github.com/spack/spack
   #branch = develop
-  #url = https://github.com/NOAA-EMC/spack
-  #branch = jcsda_emc_spack_stack
-  url = https://github.com/climbfuji/spack
-  branch = feature/buildcaches
+  url = https://github.com/NOAA-EMC/spack
+  branch = jcsda_emc_spack_stack
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules
diff --git a/spack b/spack
index 7ed0fc6fb..c5a3c25ba 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 7ed0fc6fb074937b6626550e588cfe38c5b3c419
+Subproject commit c5a3c25ba193fe039015c0693be93b03816257dd