diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2016-11-21 15:54:26 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-12-20 16:24:21 +0100 |
| commit | 65c8f2890ca4f41f5b933b5bc1e43de86cc1bd54 (patch) | |
| tree | b24f2d1b6c9056a5038a8a6ed76571302b745bd8 /package/boot/grub2/patches/100-grub_setup_root.patch | |
| parent | 77812cdfec6258c3a4db9256419e9dbdcaf8d7ec (diff) | |
| download | mtk-20170518-65c8f2890ca4f41f5b933b5bc1e43de86cc1bd54.zip mtk-20170518-65c8f2890ca4f41f5b933b5bc1e43de86cc1bd54.tar.gz mtk-20170518-65c8f2890ca4f41f5b933b5bc1e43de86cc1bd54.tar.bz2 | |
grub2: upgrade to 2.02-beta3 (3 years newer than previous)
'100-musl-compat.patch' does not seem to be required anymore.
'210-fix_serial_rtscts.patchi' is superseeded by:
http://git.savannah.gnu.org/cgit/grub.git/commit/?id=bac5d1a64ab4191058a8fd4c05f6b3b339e249e7
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Diffstat (limited to 'package/boot/grub2/patches/100-grub_setup_root.patch')
| -rw-r--r-- | package/boot/grub2/patches/100-grub_setup_root.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/boot/grub2/patches/100-grub_setup_root.patch b/package/boot/grub2/patches/100-grub_setup_root.patch index 9619c41..f053ba9 100644 --- a/package/boot/grub2/patches/100-grub_setup_root.patch +++ b/package/boot/grub2/patches/100-grub_setup_root.patch @@ -17,7 +17,7 @@ int force; int fs_probe; int allow_floppy; -@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct +@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct argp_state *state) arguments->dev_map = xstrdup (arg); break; @@ -42,7 +42,7 @@ --- a/util/setup.c +++ b/util/setup.c -@@ -247,13 +247,12 @@ identify_partmap (grub_disk_t disk __att +@@ -247,13 +247,12 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)), void SETUP (const char *dir, const char *boot_file, const char *core_file, @@ -69,7 +69,7 @@ char **root_devices = grub_guess_root_devices (dir); char **cur; int found = 0; -@@ -317,6 +319,8 @@ SETUP (const char *dir, +@@ -320,6 +322,8 @@ SETUP (const char *dir, char *drive; grub_device_t try_dev; @@ -80,7 +80,7 @@ continue; --- a/include/grub/util/install.h +++ b/include/grub/util/install.h -@@ -182,13 +182,13 @@ grub_install_get_image_target (const cha +@@ -184,13 +184,13 @@ grub_install_get_image_target (const char *arg); void grub_util_bios_setup (const char *dir, const char *boot_file, const char *core_file, @@ -98,7 +98,7 @@ --- a/util/grub-install.c +++ b/util/grub-install.c -@@ -1660,7 +1660,7 @@ main (int argc, char *argv[]) +@@ -1673,7 +1673,7 @@ main (int argc, char *argv[]) /* Now perform the installation. */ if (install_bootsector) grub_util_bios_setup (platdir, "boot.img", "core.img", @@ -107,12 +107,12 @@ fs_probe, allow_floppy, add_rs_codes); break; } -@@ -1686,7 +1686,7 @@ main (int argc, char *argv[]) +@@ -1699,7 +1699,7 @@ main (int argc, char *argv[]) /* Now perform the installation. */ if (install_bootsector) grub_util_sparc_setup (platdir, "boot.img", "core.img", -- install_device, force, -+ NULL, install_device, force, +- install_drive, force, ++ NULL, install_drive, force, fs_probe, allow_floppy, 0 /* unused */ ); break; |