diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-06-23 00:32:22 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-06-23 00:32:22 +0200 |
| commit | 6402b188ddd100b3cd6afe7b8a3e553365203f43 (patch) | |
| tree | 676b85e4a6ffee092e413e723f7dce8ba01bb48f /nixpkgs/pkgs/os-specific/linux/kexec-tools | |
| parent | 5a1826585861b32ce2509c0643e793196d81893e (diff) | |
| parent | d603719ec6e294f034936c0d0dc06f689d91b6c3 (diff) | |
| download | nixlib-master.tar nixlib-master.tar.gz nixlib-master.tar.bz2 nixlib-master.tar.lz nixlib-master.tar.xz nixlib-master.tar.zst nixlib-master.zip | |
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/kexec-tools')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix index 530fd767bb90..caecc7f9c10e 100644 --- a/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix @@ -18,7 +18,12 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; }) - ]; + # binutils-2.42 support + (fetchpatch { + url = "https://github.com/horms/kexec-tools/commit/328de8e00e298f00d7ba6b25dc3950147e9642e6.patch"; + hash = "sha256-wVQI4oV+hBLq3kGIp2+F5J3f6s/TypDu3Xq583KYc3U="; + }) + ] ++ lib.optional (stdenv.hostPlatform.useLLVM or false) ./fix-purgatory-llvm-libunwind.patch; hardeningDisable = [ "format" "pic" "relro" "pie" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch b/nixpkgs/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch new file mode 100644 index 000000000000..235410da94f2 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch @@ -0,0 +1,11 @@ +--- a/purgatory/Makefile 2024-06-06 23:59:33.089005832 -0700 ++++ b/purgatory/Makefile 2024-06-06 23:59:56.761169892 -0700 +@@ -62,7 +62,7 @@ + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ + -Wl,--no-undefined -nostartfiles -nostdlib \ + -nodefaultlibs -e purgatory_start -r \ +- -Wl,-Map=$(PURGATORY_MAP) ++ -Wl,-Map=$(PURGATORY_MAP) -static + + $(PURGATORY): $(PURGATORY_OBJS) + $(MKDIR) -p $(@D) |