From 1cd6239bc224630205d0cec2723afb03fcc13b14 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Fri, 23 Aug 2024 17:09:44 +0200 Subject: [PATCH] Fix commit hash --- .cherry-pick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index ee8c94bb..21ff141f 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -50,7 +50,7 @@ git cherry-pick 8becc0ca3c86f1fa26593909da03effbc665c31c -X theirs --no-commit curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/45862.diff | patch -p1 # dd4hep: add patch not to install plugins at CMAKE_INSTALL_LIBDIR -git cherry-pick 6cb6f338d869de7b29d672083f15bfd2aefd2d45 -X theirs --no-commit +git cherry-pick 21c9d43cdbdb1de3164c1754696d74cb7fb448d9 -X theirs --no-commit if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID=ubuntu' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="22.04"' ]]; then