jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

grub: unify patch_args to -Np1

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2021-06-18 07:09:47 +07:00 committed by Đoàn Trần Công Danh
parent 3aeafb6ad6
commit 8be2201d76
7 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/grub/patches/0004-add-GRUB_COLOR_variables.patch
View file

@ -1,7 +1,7 @@
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 3390ba9..c416489 100644 index 3390ba9..c416489 100644
--- util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -218,6 +218,8 @@ export GRUB_DEFAULT \ @@ -218,6 +218,8 @@ export GRUB_DEFAULT \
GRUB_THEME \ GRUB_THEME \
GRUB_GFXPAYLOAD_LINUX \ GRUB_GFXPAYLOAD_LINUX \
@ -13,8 +13,8 @@ index 3390ba9..c416489 100644
GRUB_ENABLE_CRYPTODISK \ GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index d2e7252..8259f45 100644 index d2e7252..8259f45 100644
--- util/grub.d/00_header.in --- a/util/grub.d/00_header.in
+++ util/grub.d/00_header.in +++ b/util/grub.d/00_header.in
@@ -125,6 +125,14 @@ cat <<EOF @@ -125,6 +125,14 @@ cat <<EOF
EOF EOF

1
srcpkgs/grub/patches/grub-install-pvxen-paths.patch.args
View file

@ -1 +0,0 @@
-Np1

4
srcpkgs/grub/patches/ieee1275-clear-reset.patch
View file

@ -19,8 +19,8 @@ Patch-Name: ieee1275-clear-reset.patch
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
index f0d3e3deb..7cb7909c8 100644 index f0d3e3deb..7cb7909c8 100644
--- grub-core/term/terminfo.c --- a/grub-core/term/terminfo.c
+++ grub-core/term/terminfo.c +++ b/grub-core/term/terminfo.c
@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term, @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
/* Clear the screen. Using serial console, screen(1) only recognizes the /* Clear the screen. Using serial console, screen(1) only recognizes the
* ANSI escape sequence. Using video console, Apple Open Firmware * ANSI escape sequence. Using video console, Apple Open Firmware

24
srcpkgs/grub/patches/install_powerpc_machtypes.patch
View file

@ -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 diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
index 4b5502aeb..2ab907976 100644 index 4b5502aeb..2ab907976 100644
--- grub-core/osdep/basic/platform.c --- a/grub-core/osdep/basic/platform.c
+++ grub-core/osdep/basic/platform.c +++ b/grub-core/osdep/basic/platform.c
@@ -24,3 +24,8 @@ grub_install_get_default_x86_platform (void) @@ -24,3 +24,8 @@ grub_install_get_default_x86_platform (void)
return "i386-pc"; 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 diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
index 35f1bcc0e..9805c36d4 100644 index 35f1bcc0e..9805c36d4 100644
--- grub-core/osdep/linux/platform.c --- a/grub-core/osdep/linux/platform.c
+++ grub-core/osdep/linux/platform.c +++ b/grub-core/osdep/linux/platform.c
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <grub/emu/misc.h> #include <grub/emu/misc.h>
#include <sys/types.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 diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
index a3fcfcaca..28cb37e15 100644 index a3fcfcaca..28cb37e15 100644
--- grub-core/osdep/unix/platform.c --- a/grub-core/osdep/unix/platform.c
+++ 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, @@ -212,13 +212,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
else else
boot_device = get_ofpathname (install_device); boot_device = get_ofpathname (install_device);
@ -166,8 +166,8 @@ index a3fcfcaca..28cb37e15 100644
free (boot_device); free (boot_device);
diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
index 912269191..c30025b13 100644 index 912269191..c30025b13 100644
--- grub-core/osdep/windows/platform.c --- a/grub-core/osdep/windows/platform.c
+++ grub-core/osdep/windows/platform.c +++ b/grub-core/osdep/windows/platform.c
@@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void) @@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void)
return "i386-efi"; 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 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
index 5ca4811cd..9f517a1bb 100644 index 5ca4811cd..9f517a1bb 100644
--- include/grub/util/install.h --- a/include/grub/util/install.h
+++ include/grub/util/install.h +++ b/include/grub/util/install.h
@@ -206,6 +206,9 @@ grub_install_create_envblk_file (const char *name); @@ -206,6 +206,9 @@ grub_install_create_envblk_file (const char *name);
const char * const char *
grub_install_get_default_x86_platform (void); grub_install_get_default_x86_platform (void);
@ -197,8 +197,8 @@ index 5ca4811cd..9f517a1bb 100644
const char *efifile_path, const char *efifile_path,
diff --git a/util/grub-install.c b/util/grub-install.c diff --git a/util/grub-install.c b/util/grub-install.c
index e1a0202da..70b22eec4 100644 index e1a0202da..70b22eec4 100644
--- util/grub-install.c --- a/util/grub-install.c
+++ util/grub-install.c +++ b/util/grub-install.c
@@ -1155,7 +1155,18 @@ main (int argc, char *argv[]) @@ -1155,7 +1155,18 @@ main (int argc, char *argv[])
if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275) if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275)

4
srcpkgs/grub/patches/os-prober-osx86.patch
View file

@ -1,7 +1,7 @@
Patches OS X detection out of os-prober hook on non-x86 architectures. The 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. menu entries generated for those are invalid for non-x86 Mac stuff.
--- util/grub.d/30_os-prober.in --- a/util/grub.d/30_os-prober.in
+++ util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in
@@ -42,6 +42,11 @@ if [ -z "${OSPROBED}" ] ; then @@ -42,6 +42,11 @@ if [ -z "${OSPROBED}" ] ; then
fi fi

4
srcpkgs/grub/patches/ppc64el-disable-vsx.patch
View file

@ -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 diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
index 21c884b43..de9a9601a 100644 index 21c884b43..de9a9601a 100644
--- grub-core/kern/powerpc/ieee1275/startup.S --- a/grub-core/kern/powerpc/ieee1275/startup.S
+++ grub-core/kern/powerpc/ieee1275/startup.S +++ b/grub-core/kern/powerpc/ieee1275/startup.S
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/offsets.h> #include <grub/offsets.h>

1
srcpkgs/grub/template
View file

@ -16,6 +16,7 @@ checksum=e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d
archs="i686* x86_64* aarch64* ppc ppc-musl ppc64*" archs="i686* x86_64* aarch64* ppc ppc-musl ppc64*"
nopie=yes nopie=yes
patch_args=-Np1
subpackages="grub-utils" subpackages="grub-utils"
# _SUPPLEMENTARY_BUILDS is a list of <TARGET>-<PLATFORN> version of grub to build # _SUPPLEMENTARY_BUILDS is a list of <TARGET>-<PLATFORN> version of grub to build