From e9ad02461516d74b3e53c5fde55bd41f104dcad5 Mon Sep 17 00:00:00 2001
From: William Johansson <radar@radhuset.org>
Date: Mon, 3 May 2021 19:34:21 +0200
Subject: [PATCH] xen: move patches specific for 4.10

Makes it easier to include 4.15 patches later.
---
 ...all-python.patch => 0000-fix-install-python.4.10.patch} | 0
 ...000-fix-ipxe-src.patch => 0000-fix-ipxe-src.4.10.patch} | 0
 ...se-efi-ld.patch => 0004-makefile-use-efi-ld.4.10.patch} | 0
 ...patch => 0005-makefile-fix-efi-mountdir-use.4.10.patch} | 0
 pkgs/applications/virtualization/xen/4.10.nix              | 7 +++++++
 pkgs/applications/virtualization/xen/generic.nix           | 4 ----
 6 files changed, 7 insertions(+), 4 deletions(-)
 rename pkgs/applications/virtualization/xen/{0000-fix-install-python.patch => 0000-fix-install-python.4.10.patch} (100%)
 rename pkgs/applications/virtualization/xen/{0000-fix-ipxe-src.patch => 0000-fix-ipxe-src.4.10.patch} (100%)
 rename pkgs/applications/virtualization/xen/{0004-makefile-use-efi-ld.patch => 0004-makefile-use-efi-ld.4.10.patch} (100%)
 rename pkgs/applications/virtualization/xen/{0005-makefile-fix-efi-mountdir-use.patch => 0005-makefile-fix-efi-mountdir-use.4.10.patch} (100%)

diff --git a/pkgs/applications/virtualization/xen/0000-fix-install-python.patch b/pkgs/applications/virtualization/xen/0000-fix-install-python.4.10.patch
similarity index 100%
rename from pkgs/applications/virtualization/xen/0000-fix-install-python.patch
rename to pkgs/applications/virtualization/xen/0000-fix-install-python.4.10.patch
diff --git a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.10.patch
similarity index 100%
rename from pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
rename to pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.10.patch
diff --git a/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch b/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.10.patch
similarity index 100%
rename from pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch
rename to pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.10.patch
diff --git a/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch b/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.10.patch
similarity index 100%
rename from pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch
rename to pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.10.patch
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index cb91d8505633..a7a1807790cc 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -165,6 +165,13 @@ callPackage (import ./generic.nix (rec {
     "-Wno-error=zero-length-bounds"
   ];
 
+  patches = [
+    ./0000-fix-ipxe-src.4.10.patch
+    ./0000-fix-install-python.4.10.patch
+    ./0004-makefile-use-efi-ld.4.10.patch
+    ./0005-makefile-fix-efi-mountdir-use.4.10.patch
+  ];
+
   postPatch = ''
     # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
     sed 1i'#include <sys/sysmacros.h>' \
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 8299304045d0..2b7addc52e46 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -133,10 +133,6 @@ stdenv.mkDerivation (rec {
   '';
 
   patches = [
-    ./0000-fix-ipxe-src.patch
-    ./0000-fix-install-python.patch
-    ./0004-makefile-use-efi-ld.patch
-    ./0005-makefile-fix-efi-mountdir-use.patch
   ] ++ (config.patches or []);
 
   postPatch = ''