[packages/grub2] started upgrade to 2.04
atler
atler at pld-linux.org
Fri Jul 5 15:02:23 CEST 2019
commit 9b98f246f4912ad70bbd93091d2e7fa15639a5ee
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Jul 5 14:17:52 2019 +0200
started upgrade to 2.04
- patches no longer required
* add-vlan-tag-support (vlans supported by upstream now)
* gcc8, binutils, xfs (applied upstream)
* intel-ucode (handled upstream with GRUB_EARLY_INITRD_LINUX_STOCK)
- bls patch needs adjusting
add-vlan-tag-support.patch | 160 ----------------------------------------
choose-preferred-initrd.patch | 6 +-
gcc8.patch | 62 ----------------
grub-mkconfig-diagnostics.patch | 48 ++++++------
grub2-binutils.patch | 65 ----------------
grub2.spec | 19 +----
intel-ucode.patch | 50 -------------
xfs.patch | 37 ----------
8 files changed, 30 insertions(+), 417 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index a121d10..21ed226 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -46,12 +46,12 @@ Summary(hu.UTF-8): GRUB2 - rendszerbetöltő x86 és ppc gépekhez
Summary(pl.UTF-8): GRUB2 - bootloader dla x86 i ppc
Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2
Name: grub2
-Version: 2.02
-Release: 5
+Version: 2.04
+Release: 0.1
License: GPL v2
Group: Base
Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
-# Source0-md5: 8a4a2a95aac551fb0fba860ceabfa1d3
+# Source0-md5: 5aaca6713b47ca2456d8324a58755ac7
Source1: update-grub
Source2: update-grub.8
Source3: grub.sysconfig
@@ -63,18 +63,12 @@ Patch4: pld-mkconfigdir.patch
Patch5: grub-mkconfig-diagnostics.patch
Patch6: posix.patch
Patch7: %{name}-fonts_path.patch
-Patch8: add-vlan-tag-support.patch
Patch9: just-say-linux.patch
Patch10: ignore-kernel-symlinks.patch
Patch11: choose-preferred-initrd.patch
Patch12: %{name}-cfg.patch
Patch13: efi-net-fix.patch
Patch14: blscfg.patch
-# https://git.archlinux.org/svntogit/packages.git/plain/trunk/0002-intel-ucode.patch?h=packages/grub
-Patch15: intel-ucode.patch
-Patch16: xfs.patch
-Patch17: gcc8.patch
-Patch18: grub2-binutils.patch
URL: http://www.gnu.org/software/grub/
BuildRequires: autoconf >= 2.53
BuildRequires: automake >= 1:1.11.1-1
@@ -296,17 +290,12 @@ Motyw starfield dla GRUB-a.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p0
%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
+#%patch14 -p1
# we don't have C.utf-8 and need an UTF-8 locale for build
sed -i -e 's/LC_ALL=C.UTF-8/LC_ALL=en_US.utf-8/g' po/Makefile* po/Rules*
diff --git a/add-vlan-tag-support.patch b/add-vlan-tag-support.patch
deleted file mode 100644
index c45473e..0000000
--- a/add-vlan-tag-support.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c grub-2.00.git20131218/grub-core/kern/ieee1275/init.c
---- grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/grub-core/kern/ieee1275/init.c 2013-12-18 14:39:17.000000000 +0100
-@@ -118,6 +118,7 @@
- char *dev, *canon;
- char *ptr;
- dev = grub_ieee1275_get_aliasdevname (bootpath);
-+ grub_ieee1275_parse_net_options (bootpath);
- canon = grub_ieee1275_canonicalise_devname (dev);
- ptr = canon + grub_strlen (canon) - 1;
- while (ptr > canon && (*ptr == ',' || *ptr == ':'))
-Only in grub-2.00.git20131218/grub-core/kern/ieee1275: init.c.orig
-diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c grub-2.00.git20131218/grub-core/kern/ieee1275/openfw.c
---- grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/grub-core/kern/ieee1275/openfw.c 2013-12-18 14:39:17.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <grub/mm.h>
- #include <grub/ieee1275/ieee1275.h>
- #include <grub/net.h>
-+#include <grub/env.h>
-
- enum grub_ieee1275_parse_type
- {
-@@ -451,6 +452,35 @@
- return ret;
- }
-
-+int
-+grub_ieee1275_parse_net_options (const char *path)
-+{
-+ char *comma;
-+ char *args;
-+ char *option = 0;
-+
-+ args = grub_ieee1275_get_devargs (path);
-+ if (!args)
-+ /* There is no option. */
-+ return -1;
-+
-+ do
-+ {
-+ comma = grub_strchr (args, ',');
-+ if (! comma)
-+ option = grub_strdup (args);
-+ else
-+ option = grub_strndup (args, (grub_size_t)(comma - args));
-+ args = comma + 1;
-+
-+ if (! grub_strncmp(option, "vtag", 4))
-+ grub_env_set ("vlan-tag", option + grub_strlen("vtag="));
-+
-+ } while (comma);
-+
-+ return 0;
-+}
-+
- char *
- grub_ieee1275_get_device_type (const char *path)
- {
-Only in grub-2.00.git20131218/grub-core/kern/ieee1275: openfw.c.orig
-diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131218/grub-core/net/ethernet.c
---- grub-2.00.git20131218.orig/grub-core/net/ethernet.c 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/grub-core/net/ethernet.c 2013-12-18 14:39:17.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <grub/net/arp.h>
- #include <grub/net/netbuff.h>
- #include <grub/net.h>
-+#include <grub/env.h>
- #include <grub/time.h>
- #include <grub/net/arp.h>
-
-@@ -56,10 +57,19 @@
- {
- struct etherhdr *eth;
- grub_err_t err;
-+ grub_uint32_t vlantag = 0;
-+ grub_uint8_t etherhdr_size;
-
-- COMPILE_TIME_ASSERT (sizeof (*eth) < GRUB_NET_MAX_LINK_HEADER_SIZE);
-+ etherhdr_size = sizeof (*eth);
-+ COMPILE_TIME_ASSERT (sizeof (*eth) + 4 < GRUB_NET_MAX_LINK_HEADER_SIZE);
-
-- err = grub_netbuff_push (nb, sizeof (*eth));
-+ const char *vlantag_text = grub_env_get ("vlan-tag");
-+ if (vlantag_text != 0) {
-+ etherhdr_size += 4;
-+ vlantag = grub_strtoul (vlantag_text, 0, 16);
-+ }
-+
-+ err = grub_netbuff_push (nb, etherhdr_size);
- if (err)
- return err;
- eth = (struct etherhdr *) nb->data;
-@@ -76,6 +86,19 @@
- return err;
- inf->card->opened = 1;
- }
-+
-+ /* Check if a vlan-tag is needed. */
-+ if (vlantag != 0)
-+ {
-+ /* Move eth type to the right */
-+ grub_memcpy((char *) nb->data + etherhdr_size - 2,
-+ (char *) nb->data + etherhdr_size - 6, 2);
-+
-+ /* Add the tag in the middle */
-+ grub_memcpy((char *) nb->data + etherhdr_size - 6,
-+ &vlantag, 4);
-+ }
-+
- return inf->card->driver->send (inf->card, nb);
- }
-
-@@ -90,10 +113,23 @@
- grub_net_link_level_address_t hwaddress;
- grub_net_link_level_address_t src_hwaddress;
- grub_err_t err;
-+ grub_uint8_t etherhdr_size = sizeof (*eth);
-+
-+ grub_uint16_t vlantag_identifier = 0;
-+ grub_memcpy (&vlantag_identifier, nb->data + etherhdr_size - 2, 2);
-+
-+ /* Check if a vlan-tag is present. */
-+ if (vlantag_identifier == VLANTAG_IDENTIFIER)
-+ {
-+ etherhdr_size += 4;
-+ /* Move eth type to the original position */
-+ grub_memcpy((char *) nb->data + etherhdr_size - 6,
-+ (char *) nb->data + etherhdr_size - 2, 2);
-+ }
-
- eth = (struct etherhdr *) nb->data;
- type = grub_be_to_cpu16 (eth->type);
-- err = grub_netbuff_pull (nb, sizeof (*eth));
-+ err = grub_netbuff_pull (nb, etherhdr_size);
- if (err)
- return err;
-
-diff -dur grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h grub-2.00.git20131218/include/grub/ieee1275/ieee1275.h
---- grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/include/grub/ieee1275/ieee1275.h 2013-12-18 14:40:11.000000000 +0100
-@@ -226,6 +226,7 @@
- char *EXPORT_FUNC(grub_ieee1275_canonicalise_devname) (const char *path);
- char *EXPORT_FUNC(grub_ieee1275_get_device_type) (const char *path);
- char *EXPORT_FUNC(grub_ieee1275_get_devname) (const char *path);
-+int EXPORT_FUNC(grub_ieee1275_parse_net_options) (const char *path);
-
- void EXPORT_FUNC(grub_ieee1275_devalias_init_iterator) (struct grub_ieee1275_devalias *alias);
- void EXPORT_FUNC(grub_ieee1275_devalias_free) (struct grub_ieee1275_devalias *alias);
-diff -dur grub-2.00.git20131218.orig/include/grub/net.h grub-2.00.git20131218/include/grub/net.h
---- grub-2.00.git20131218.orig/include/grub/net.h 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/include/grub/net.h 2013-12-18 14:39:18.000000000 +0100
-@@ -533,4 +533,6 @@
- #define GRUB_NET_TRIES 40
- #define GRUB_NET_INTERVAL 400
-
-+#define VLANTAG_IDENTIFIER 0x8100
-+
- #endif /* ! GRUB_NET_HEADER */
-Only in grub-2.00.git20131218/include/grub: net.h.orig
diff --git a/choose-preferred-initrd.patch b/choose-preferred-initrd.patch
index 12a01ba..3dcc197 100644
--- a/choose-preferred-initrd.patch
+++ b/choose-preferred-initrd.patch
@@ -15,9 +15,9 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.
--- grub-2.00.git20131218.orig/util/grub.d/10_linux.in 2013-12-18 14:44:31.000000000 +0100
+++ grub-2.00.git20131218/util/grub.d/10_linux.in 2013-12-18 14:44:49.000000000 +0100
@@ -198,10 +198,12 @@
- linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+ done
- initrd=
+ initrd_real=
- for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
- "initrd-${version}" "initramfs-${version}.img" \
- "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
@@ -37,7 +37,7 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in gru
@@ -207,10 +207,12 @@
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- initrd=
+ initrd_real=
- for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
- "initrd-${version}" "initramfs-${version}.img" \
- "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
diff --git a/gcc8.patch b/gcc8.patch
deleted file mode 100644
index 63a8917..0000000
--- a/gcc8.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit 563b1da6e6ae7af46cc8354cadb5dab416989f0a
-Author: Michael Chang <mchang at suse.com>
-Date: Mon Mar 26 16:52:34 2018 +0800
-
- Fix packed-not-aligned error on GCC 8
-
- When building with GCC 8, there are several errors regarding packed-not-aligned.
-
- ./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned]
-
- This patch fixes the build error by cleaning up the ambiguity of placing
- aligned structure in a packed one. In "struct grub_btrfs_time" and "struct
- grub_gpt_part_type", the aligned attribute seems to be superfluous, and also
- has to be packed, to ensure the structure is bit-to-bit mapped to the format
- laid on disk. I think we could blame to copy and paste error here for the
- mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as
- the name suggests. :)
-
- Signed-off-by: Michael Chang <mchang at suse.com>
- Tested-by: Michael Chang <mchang at suse.com>
- Tested-by: Paul Menzel <paulepanter at users.sourceforge.net>
- Reviewed-by: Daniel Kiper <daniel.kiper at oracle.com>
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4849c1ceb..be195448d 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -175,7 +175,7 @@ struct grub_btrfs_time
- {
- grub_int64_t sec;
- grub_uint32_t nanosec;
--} __attribute__ ((aligned (4)));
-+} GRUB_PACKED;
-
- struct grub_btrfs_inode
- {
-diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
-index 9b6b729f4..36d2dedf4 100644
---- a/include/grub/efiemu/runtime.h
-+++ b/include/grub/efiemu/runtime.h
-@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel
-
- struct efi_variable
- {
-- grub_efi_guid_t guid;
-+ grub_efi_packed_guid_t guid;
- grub_uint32_t namelen;
- grub_uint32_t size;
- grub_efi_uint32_t attributes;
-diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
-index 1b32f6725..9668a68c3 100644
---- a/include/grub/gpt_partition.h
-+++ b/include/grub/gpt_partition.h
-@@ -28,7 +28,7 @@ struct grub_gpt_part_type
- grub_uint16_t data2;
- grub_uint16_t data3;
- grub_uint8_t data4[8];
--} __attribute__ ((aligned(8)));
-+} GRUB_PACKED;
- typedef struct grub_gpt_part_type grub_gpt_part_type_t;
-
- #define GRUB_GPT_PARTITION_TYPE_EMPTY \
diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index 3d6a566..9a4e282 100644
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -124,10 +124,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in gr
module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
fi
-diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-2.02~beta2/util/grub.d/10_linux.in
---- grub-2.02~beta2.orig/util/grub.d/10_linux.in 2014-01-04 10:50:51.000000000 +0100
-+++ grub-2.02~beta2/util/grub.d/10_linux.in 2014-01-04 11:34:50.135240649 +0100
-@@ -176,7 +176,7 @@
+--- grub-2.04/util/grub.d/10_linux.in.orig 2018-11-24 18:13:02.000000000 +0100
++++ grub-2.04/util/grub.d/10_linux.in 2019-07-05 13:53:33.737370014 +0200
+@@ -194,7 +194,7 @@
is_top_level=true
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
@@ -136,15 +135,15 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -213,7 +213,7 @@
+@@ -233,7 +233,7 @@
+ for i in ${initrd}; do
+ initrd_display="${initrd_display} ${dirname}/${i}"
+ done
+- gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
++ gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&3
fi
- if test -n "${initrd}" ; then
-- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
-+ gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&3
- elif test -z "${initramfs}" ; then
- # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
- # no initrd or builtin initramfs, it can't work here.
+ config=
diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_netbsd.in grub-2.02~beta2/util/grub.d/10_netbsd.in
--- grub-2.02~beta2.orig/util/grub.d/10_netbsd.in 2013-12-17 18:25:57.000000000 +0100
+++ grub-2.02~beta2/util/grub.d/10_netbsd.in 2014-01-04 11:34:50.135240649 +0100
@@ -169,11 +168,10 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in gru
cat << EOF
menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
EOF
-diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in grub-2.02~beta2/util/grub.d/20_linux_xen.in
---- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in 2014-01-04 10:50:51.000000000 +0100
-+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in 2014-01-04 11:34:50.135240649 +0100
-@@ -204,7 +204,7 @@
- fi
+--- grub-2.04/util/grub.d/20_linux_xen.in.orig 2019-04-23 10:54:47.000000000 +0200
++++ grub-2.04/util/grub.d/20_linux_xen.in 2019-07-05 13:55:11.220267798 +0200
+@@ -243,7 +243,7 @@
+
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
- gettext_printf "Found linux image: %s\n" "$linux" >&2
@@ -181,15 +179,15 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in g
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -227,7 +227,7 @@
- fi
- done
- if test -n "${initrd}" ; then
-- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
-+ gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&3
- else
- # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
- linux_root_device_thisversion=${GRUB_DEVICE}
+@@ -274,7 +274,7 @@
+ for i in ${initrd}; do
+ initrd_display="${initrd_display} ${dirname}/${i}"
+ done
+- gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
++ gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&3
+ fi
+
+ if test -z "${initrd_real}"; then
diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/30_os-prober.in grub-2.02~beta2/util/grub.d/30_os-prober.in
--- grub-2.02~beta2.orig/util/grub.d/30_os-prober.in 2014-01-04 10:50:51.000000000 +0100
+++ grub-2.02~beta2/util/grub.d/30_os-prober.in 2014-01-04 11:34:50.135240649 +0100
diff --git a/grub2-binutils.patch b/grub2-binutils.patch
deleted file mode 100644
index 1aeae68..0000000
--- a/grub2-binutils.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 842c390469e2c2e10b5aa36700324cd3bde25875
-Author: H.J. Lu <hjl.tools at gmail.com>
-Date: Sat Feb 17 06:47:28 2018 -0800
-
- x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
-
- Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
-
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
-
- x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
- 32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as
- R_X86_64_PC32.
-
- Signed-off-by: H.J. Lu <hjl.tools at gmail.com>
- Reviewed-by: Daniel Kiper <daniel.kiper at oracle.com>
-
-diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
-index e49d0b6ff..18facf47f 100644
---- a/grub-core/efiemu/i386/loadcore64.c
-+++ b/grub-core/efiemu/i386/loadcore64.c
-@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
- break;
-
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- err = grub_efiemu_write_value (addr,
- *addr32 + rel->r_addend
- + sym.off
-diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
-index 440690673..3a73e6e6c 100644
---- a/grub-core/kern/x86_64/dl.c
-+++ b/grub-core/kern/x86_64/dl.c
-@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
- break;
-
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- {
- grub_int64_t value;
- value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
-diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index a2bb05439..39d7efb91 100644
---- a/util/grub-mkimagexx.c
-+++ b/util/grub-mkimagexx.c
-@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
- break;
-
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- {
- grub_uint32_t *t32 = (grub_uint32_t *) target;
- *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
-index 9179285a5..a79271f66 100644
---- a/util/grub-module-verifier.c
-+++ b/util/grub-module-verifier.c
-@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
- -1
- }, (int[]){
- R_X86_64_PC32,
-+ R_X86_64_PLT32,
- -1
- }
- },
diff --git a/intel-ucode.patch b/intel-ucode.patch
deleted file mode 100644
index e69715c..0000000
--- a/intel-ucode.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index de9044c..f5d3e78 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -133,13 +133,15 @@ linux_entry ()
- echo '$(echo "$message" | grub_quote)'
- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
- EOF
-- if test -n "${initrd}" ; then
-+ if test -n "${initrd}" -o -n "${initrd_extra}" ; then
- # TRANSLATORS: ramdisk isn't identifier. Should be translated.
- message="$(gettext_printf "Loading initial ramdisk ...")"
-- sed "s/^/$submenu_indentation/" << EOF
-- echo '$(echo "$message" | grub_quote)'
-- initrd ${rel_dirname}/${initrd}
--EOF
-+ printf ' %s\n' "echo '$(echo "$message" | grub_quote)'" | sed "s/^/$submenu_indentation/"
-+ printf ' %s ' 'initrd' | sed "s/^/$submenu_indentation/"
-+ for i in ${initrd_extra} ${initrd}; do
-+ printf ' %s/%s' "${rel_dirname}" "${i}"
-+ done
-+ printf '\n'
- fi
- sed "s/^/$submenu_indentation/" << EOF
- }
-@@ -202,6 +204,12 @@ while [ "x$list" != "x" ] ; do
- break
- fi
- done
-+ initrd_extra=
-+ for i in intel-ucode.img; do
-+ if test -e "${dirname}/${i}" ; then
-+ initrd_extra="${initrd_extra} ${i}"
-+ fi
-+ done
-
- config=
- for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
-@@ -226,8 +226,8 @@ while [ "x$list" != "x" ] ; do
- initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
- fi
-
-- if test -n "${initrd}" ; then
-- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&3
-+ if test -n "${initrd}" -o -n "${initrd_extra}" ; then
-+ gettext_printf "Found initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
- elif test -z "${initramfs}" ; then
- # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
- # no initrd or builtin initramfs, it can't work here.
-
diff --git a/xfs.patch b/xfs.patch
deleted file mode 100644
index 6ffd2b5..0000000
--- a/xfs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-The sparse inode metadata format became a mkfs.xfs default in
-xfsprogs-4.16.0, and such filesystems are now rejected by grub as
-containing an incompatible feature.
-
-In essence, this feature allows xfs to allocate inodes into fragmented
-freespace. (Without this feature, if xfs could not allocate contiguous
-space for 64 new inodes, inode creation would fail.)
-
-In practice, the disk format change is restricted to the inode btree,
-which as far as I can tell is not used by grub. If all you're doing
-today is parsing a directory, reading an inode number, and converting
-that inode number to a disk location, then ignoring this feature
-should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED
-
-I did some brief testing of this patch by hacking up the regression
-tests to completely fragment freespace on the test xfs filesystem, and
-then write a large-ish number of inodes to consume any existing
-contiguous 64-inode chunk. This way any files the grub tests add and
-traverse would be in such a fragmented inode allocation. Tests passed,
-but I'm not sure how to cleanly integrate that into the test harness.
-
-Signed-off-by: Eric Sandeen <sandeen at redhat.com>
----
-
-diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index c6031bd3f..effe9de17 100644
---- a/grub-core/fs/xfs.c
-+++ b/grub-core/fs/xfs.c
-@@ -82,6 +82,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- /* We do not currently verify metadata UUID so it is safe to read such filesystem */
- #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \
- (XFS_SB_FEAT_INCOMPAT_FTYPE | \
-+ XFS_SB_FEAT_INCOMPAT_SPINODES | \
- XFS_SB_FEAT_INCOMPAT_META_UUID)
-
- struct grub_xfs_sblock
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/9b98f246f4912ad70bbd93091d2e7fa15639a5ee
More information about the pld-cvs-commit
mailing list