grub2: bump to 2.06-rc1

[openwrt/openwrt.git] / package / boot / grub2 / patches / 100-grub_setup_root.patch

diff --git a/package/boot/grub2/patches/100-grub_setup_root.patch b/package/boot/grub2/patches/100-grub_setup_root.patch
index df671bc9d24c245c2abd4dc1ffb1df5be694d0a6..e075d052cbc2f0cacf2d2df522d933dacec49ca0 100644 (file)
--- a/package/boot/grub2/patches/100-grub_setup_root.patch
+++ b/package/boot/grub2/patches/100-grub_setup_root.patch
@@ -1,3 +1,41 @@
+--- a/include/grub/util/install.h
++++ b/include/grub/util/install.h
+@@ -198,13 +198,13 @@ grub_install_get_image_target (const cha
+ void
+ grub_util_bios_setup (const char *dir,
+                     const char *boot_file, const char *core_file,
+-                    const char *dest, int force,
++                    const char *root, const char *dest, int force,
+                     int fs_probe, int allow_floppy,
+                     int add_rs_codes, int warn_short_mbr_gap);
+ void
+ grub_util_sparc_setup (const char *dir,
+                      const char *boot_file, const char *core_file,
+-                     const char *dest, int force,
++                     const char *root, const char *dest, int force,
+                      int fs_probe, int allow_floppy,
+                      int add_rs_codes, int warn_short_mbr_gap);
+ 
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -1720,7 +1720,7 @@ main (int argc, char *argv[])
+       /*  Now perform the installation.  */
+       if (install_bootsector)
+         grub_util_bios_setup (platdir, "boot.img", "core.img",
+-                              install_drive, force,
++                              NULL, install_drive, force,
+                               fs_probe, allow_floppy, add_rs_codes,
+                               !grub_install_is_short_mbrgap_supported ());
+       break;
+@@ -1747,7 +1747,7 @@ main (int argc, char *argv[])
+       /*  Now perform the installation.  */
+       if (install_bootsector)
+         grub_util_sparc_setup (platdir, "boot.img", "core.img",
+-                               install_drive, force,
++                               NULL, install_drive, force,
+                                fs_probe, allow_floppy,
+                                0 /* unused */, 0 /* unused */ );
+       break;
 --- a/util/grub-setup.c
 +++ b/util/grub-setup.c
 @@ -87,6 +87,8 @@ static struct argp_option options[] = {
@@ -38,18 +76,19 @@
 -                 dest_dev, arguments.force,
 +                 arguments.root_dev, dest_dev, arguments.force,
                   arguments.fs_probe, arguments.allow_floppy,
-                  arguments.add_rs_codes);
+                  arguments.add_rs_codes, 0);
  
 --- a/util/setup.c
 +++ b/util/setup.c
-@@ -252,13 +252,12 @@ identify_partmap (grub_disk_t disk __att
+@@ -252,14 +252,13 @@ identify_partmap (grub_disk_t disk __att
  void
  SETUP (const char *dir,
         const char *boot_file, const char *core_file,
 -       const char *dest, int force,
 +       const char *root, const char *dest, int force,
         int fs_probe, int allow_floppy,
-        int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */
+        int add_rs_codes __attribute__ ((unused)), /* unused on sparc64 */
+        int warn_small)
  {
    char *core_path;
    char *boot_img, *core_img, *boot_path;
@@ -57,7 +96,7 @@
    size_t boot_size, core_size;
    grub_uint16_t core_sectors;
    grub_device_t root_dev = 0, dest_dev, core_dev;
-@@ -307,7 +306,10 @@ SETUP (const char *dir,
+@@ -311,7 +310,10 @@ SETUP (const char *dir,
  
    core_dev = dest_dev;
  
@@ -69,7 +108,7 @@
      char **root_devices = grub_guess_root_devices (dir);
      char **cur;
      int found = 0;
-@@ -320,6 +322,8 @@ SETUP (const char *dir,
+@@ -324,6 +326,8 @@ SETUP (const char *dir,
        char *drive;
        grub_device_t try_dev;
  
@@ -78,41 +117,3 @@
        drive = grub_util_get_grub_dev (*cur);
        if (!drive)
          continue;
---- a/include/grub/util/install.h
-+++ b/include/grub/util/install.h
-@@ -191,13 +191,13 @@ grub_install_get_image_target (const cha
- void
- grub_util_bios_setup (const char *dir,
-                     const char *boot_file, const char *core_file,
--                    const char *dest, int force,
-+                    const char *root, const char *dest, int force,
-                     int fs_probe, int allow_floppy,
-                     int add_rs_codes);
- void
- grub_util_sparc_setup (const char *dir,
-                      const char *boot_file, const char *core_file,
--                     const char *dest, int force,
-+                     const char *root, const char *dest, int force,
-                      int fs_probe, int allow_floppy,
-                      int add_rs_codes);
- 
---- a/util/grub-install.c
-+++ b/util/grub-install.c
-@@ -1712,7 +1712,7 @@ main (int argc, char *argv[])
-       /*  Now perform the installation.  */
-       if (install_bootsector)
-         grub_util_bios_setup (platdir, "boot.img", "core.img",
--                              install_drive, force,
-+                              NULL, install_drive, force,
-                               fs_probe, allow_floppy, add_rs_codes);
-       break;
-       }
-@@ -1738,7 +1738,7 @@ main (int argc, char *argv[])
-       /*  Now perform the installation.  */
-       if (install_bootsector)
-         grub_util_sparc_setup (platdir, "boot.img", "core.img",
--                               install_drive, force,
-+                               NULL, install_drive, force,
-                                fs_probe, allow_floppy,
-                                0 /* unused */ );
-       break;