From 8be2201d7632babf6b1c0bfe428048bebd955937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 18 Jun 2021 07:09:47 +0700
Subject: [PATCH] grub: unify patch_args to -Np1

---
 .../0004-add-GRUB_COLOR_variables.patch       |  8 +++----
 .../grub-install-pvxen-paths.patch.args       |  1 -
 .../grub/patches/ieee1275-clear-reset.patch   |  4 ++--
 .../patches/install_powerpc_machtypes.patch   | 24 +++++++++----------
 srcpkgs/grub/patches/os-prober-osx86.patch    |  4 ++--
 .../grub/patches/ppc64el-disable-vsx.patch    |  4 ++--
 srcpkgs/grub/template                         |  1 +
 7 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/grub/patches/grub-install-pvxen-paths.patch.args

diff --git a/srcpkgs/grub/patches/0004-add-GRUB_COLOR_variables.patch b/srcpkgs/grub/patches/0004-add-GRUB_COLOR_variables.patch
index f899717c4d..c113a81d57 100644
--- a/srcpkgs/grub/patches/0004-add-GRUB_COLOR_variables.patch
+++ b/srcpkgs/grub/patches/0004-add-GRUB_COLOR_variables.patch
@@ -1,7 +1,7 @@
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
 index 3390ba9..c416489 100644
---- util/grub-mkconfig.in
-+++ util/grub-mkconfig.in
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
 @@ -218,6 +218,8 @@ export GRUB_DEFAULT \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
@@ -13,8 +13,8 @@ index 3390ba9..c416489 100644
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
 index d2e7252..8259f45 100644
---- util/grub.d/00_header.in
-+++ util/grub.d/00_header.in
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
 @@ -125,6 +125,14 @@ cat <<EOF
  
  EOF
diff --git a/srcpkgs/grub/patches/grub-install-pvxen-paths.patch.args b/srcpkgs/grub/patches/grub-install-pvxen-paths.patch.args
deleted file mode 100644
index 2eba1cb3c5..0000000000
--- a/srcpkgs/grub/patches/grub-install-pvxen-paths.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1
diff --git a/srcpkgs/grub/patches/ieee1275-clear-reset.patch b/srcpkgs/grub/patches/ieee1275-clear-reset.patch
index 96b9bd63f1..18ff7733bd 100644
--- a/srcpkgs/grub/patches/ieee1275-clear-reset.patch
+++ b/srcpkgs/grub/patches/ieee1275-clear-reset.patch
@@ -19,8 +19,8 @@ Patch-Name: ieee1275-clear-reset.patch
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
 index f0d3e3deb..7cb7909c8 100644
---- grub-core/term/terminfo.c
-+++ grub-core/term/terminfo.c
+--- a/grub-core/term/terminfo.c
++++ b/grub-core/term/terminfo.c
 @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
        /* Clear the screen.  Using serial console, screen(1) only recognizes the
         * ANSI escape sequence.  Using video console, Apple Open Firmware
diff --git a/srcpkgs/grub/patches/install_powerpc_machtypes.patch b/srcpkgs/grub/patches/install_powerpc_machtypes.patch
index ce5e36cb4a..209b726c77 100644
--- a/srcpkgs/grub/patches/install_powerpc_machtypes.patch
+++ b/srcpkgs/grub/patches/install_powerpc_machtypes.patch
@@ -26,8 +26,8 @@ Patch-Name: install_powerpc_machtypes.patch
 
 diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
 index 4b5502aeb..2ab907976 100644
---- grub-core/osdep/basic/platform.c
-+++ grub-core/osdep/basic/platform.c
+--- a/grub-core/osdep/basic/platform.c
++++ b/grub-core/osdep/basic/platform.c
 @@ -24,3 +24,8 @@ grub_install_get_default_x86_platform (void)
    return "i386-pc";
  }
@@ -39,8 +39,8 @@ index 4b5502aeb..2ab907976 100644
 +}
 diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
 index 35f1bcc0e..9805c36d4 100644
---- grub-core/osdep/linux/platform.c
-+++ grub-core/osdep/linux/platform.c
+--- a/grub-core/osdep/linux/platform.c
++++ b/grub-core/osdep/linux/platform.c
 @@ -23,6 +23,7 @@
  #include <grub/emu/misc.h>
  #include <sys/types.h>
@@ -126,8 +126,8 @@ index 35f1bcc0e..9805c36d4 100644
 +}
 diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
 index a3fcfcaca..28cb37e15 100644
---- grub-core/osdep/unix/platform.c
-+++ grub-core/osdep/unix/platform.c
+--- a/grub-core/osdep/unix/platform.c
++++ b/grub-core/osdep/unix/platform.c
 @@ -212,13 +212,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
    else
      boot_device = get_ofpathname (install_device);
@@ -166,8 +166,8 @@ index a3fcfcaca..28cb37e15 100644
    free (boot_device);
 diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
 index 912269191..c30025b13 100644
---- grub-core/osdep/windows/platform.c
-+++ grub-core/osdep/windows/platform.c
+--- a/grub-core/osdep/windows/platform.c
++++ b/grub-core/osdep/windows/platform.c
 @@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void)
      return "i386-efi";
  }
@@ -183,8 +183,8 @@ index 912269191..c30025b13 100644
  {
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
 index 5ca4811cd..9f517a1bb 100644
---- include/grub/util/install.h
-+++ include/grub/util/install.h
+--- a/include/grub/util/install.h
++++ b/include/grub/util/install.h
 @@ -206,6 +206,9 @@ grub_install_create_envblk_file (const char *name);
  const char *
  grub_install_get_default_x86_platform (void);
@@ -197,8 +197,8 @@ index 5ca4811cd..9f517a1bb 100644
  			   const char *efifile_path,
 diff --git a/util/grub-install.c b/util/grub-install.c
 index e1a0202da..70b22eec4 100644
---- util/grub-install.c
-+++ util/grub-install.c
+--- a/util/grub-install.c
++++ b/util/grub-install.c
 @@ -1155,7 +1155,18 @@ main (int argc, char *argv[])
  
    if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275)
diff --git a/srcpkgs/grub/patches/os-prober-osx86.patch b/srcpkgs/grub/patches/os-prober-osx86.patch
index 5fabbeb6d9..5226a6def3 100644
--- a/srcpkgs/grub/patches/os-prober-osx86.patch
+++ b/srcpkgs/grub/patches/os-prober-osx86.patch
@@ -1,7 +1,7 @@
 Patches OS X detection out of os-prober hook on non-x86 architectures. The
 menu entries generated for those are invalid for non-x86 Mac stuff.
---- util/grub.d/30_os-prober.in
-+++ util/grub.d/30_os-prober.in
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
 @@ -42,6 +42,11 @@ if [ -z "${OSPROBED}" ] ; then
  fi
  
diff --git a/srcpkgs/grub/patches/ppc64el-disable-vsx.patch b/srcpkgs/grub/patches/ppc64el-disable-vsx.patch
index 1f4c401815..67744dd23b 100644
--- a/srcpkgs/grub/patches/ppc64el-disable-vsx.patch
+++ b/srcpkgs/grub/patches/ppc64el-disable-vsx.patch
@@ -22,8 +22,8 @@ Patch-Name: ppc64el-disable-vsx.patch
 
 diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
 index 21c884b43..de9a9601a 100644
---- grub-core/kern/powerpc/ieee1275/startup.S
-+++ grub-core/kern/powerpc/ieee1275/startup.S
+--- a/grub-core/kern/powerpc/ieee1275/startup.S
++++ b/grub-core/kern/powerpc/ieee1275/startup.S
 @@ -20,6 +20,8 @@
  #include <grub/symbol.h>
  #include <grub/offsets.h>
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 69cea9ae19..11cbdc495f 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -16,6 +16,7 @@ checksum=e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d
 
 archs="i686* x86_64* aarch64* ppc ppc-musl ppc64*"
 nopie=yes
+patch_args=-Np1
 
 subpackages="grub-utils"
 # _SUPPLEMENTARY_BUILDS is a list of <TARGET>-<PLATFORN> version of grub to build