From 39d9d4a84fb8780da4228289daf423aaf28d739f Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Sat, 4 Nov 2023 14:08:39 +0000 Subject: user/spack: fix broken 'linux-headers' package. See: https://github.com/spack/spack/issues/40334 Also: * Upstream Spack assumes that 'linux-headers' is always installed on the system, since it is a dependency of glibc. As 'openssl' requires it, make the dependency explicit. There are likely many more occurrences of this that should be reported and fixed upstream. --- user/spack/40877.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 user/spack/40877.patch (limited to 'user/spack/40877.patch') diff --git a/user/spack/40877.patch b/user/spack/40877.patch new file mode 100644 index 000000000..4aa4368ff --- /dev/null +++ b/user/spack/40877.patch @@ -0,0 +1,26 @@ +From 1af592210d9190147e097fe26ddaa583a962557e Mon Sep 17 00:00:00 2001 +From: Zach van Rijn +Date: Fri, 3 Nov 2023 19:06:46 -0500 +Subject: [PATCH] linux-headers: support multiple versions (#40334) + +The download URL for linux-headers was hardcoded to 4.x; +we need to derive the correct URL from the version number. +--- + var/spack/repos/builtin/packages/linux-headers/package.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/var/spack/repos/builtin/packages/linux-headers/package.py b/var/spack/repos/builtin/packages/linux-headers/package.py +index 1236a25ce691e..8e1d995695b06 100644 +--- a/var/spack/repos/builtin/packages/linux-headers/package.py ++++ b/var/spack/repos/builtin/packages/linux-headers/package.py +@@ -20,6 +20,10 @@ class LinuxHeaders(Package): + version("6.2.8", sha256="fed0ad87d42f83a70ce019ff2800bc30a855e672e72bf6d54a014d98d344f665") + version("4.9.10", sha256="bd6e05476fd8d9ea4945e11598d87bc97806bbc8d03556abbaaf809707661525") + ++ def url_for_version(self, version): ++ url = "https://www.kernel.org/pub/linux/kernel/v{0}.x/linux-{1}.tar.xz" ++ return url.format(version.up_to(1), version) ++ + def setup_build_environment(self, env): + # This variable is used in the Makefile. If it is defined on the + # system, it can break the build if there is no build recipe for -- cgit v1.2.3-70-g09d2