Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2014-08-15 09:55:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and      /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "grub2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes      2014-08-13 
17:08:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2014-08-15 
09:55:43.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Aug 14 06:35:58 UTC 2014 - [email protected]
+
+- grub2-btrfs-fix-incorrect-address-reference.patch
+  * Fix incorrect address reference in GRUB_BTRFS_EXTENT_REGULAR
+    range check (bnc#869748) 
+
+-------------------------------------------------------------------
+Wed Aug 13 02:56:22 UTC 2014 - [email protected]
+
+- grub2-vbe-blacklist-preferred-1440x900x32.patch
+  * Blacklist preferred resolution 1440x900x32 which is broken on 
+    many Thinkpads (bnc#888727) 
+
+-------------------------------------------------------------------

New:
----
  grub2-btrfs-fix-incorrect-address-reference.patch
  grub2-vbe-blacklist-preferred-1440x900x32.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.MNptZK/_old  2014-08-15 09:55:45.000000000 +0200
+++ /var/tmp/diff_new_pack.MNptZK/_new  2014-08-15 09:55:45.000000000 +0200
@@ -148,6 +148,8 @@
 Patch38:        
grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
 Patch39:        grub2-use-rpmsort-for-version-sorting.patch
 Patch40:        aarch64-reloc.patch
+Patch41:        grub2-vbe-blacklist-preferred-1440x900x32.patch
+Patch42:        grub2-btrfs-fix-incorrect-address-reference.patch
 # Btrfs snapshot booting related patches
 Patch101:       0002-btrfs-add-ability-to-boot-from-subvolumes.patch
 Patch102:       0003-cmdline-add-envvar-loader_cmdline_append.patch
@@ -347,6 +349,8 @@
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
+%patch42 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1

++++++ grub2-btrfs-fix-incorrect-address-reference.patch ++++++
Index: grub-2.02~beta2/grub-core/fs/btrfs.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/fs/btrfs.c
+++ grub-2.02~beta2/grub-core/fs/btrfs.c
@@ -1051,7 +1051,7 @@ grub_btrfs_extent_read (struct grub_btrf
 
          data->extend = data->extstart + grub_le_to_cpu64 (data->extent->size);
          if (data->extent->type == GRUB_BTRFS_EXTENT_REGULAR
-             && (char *) &data->extent + elemsize
+             && (char *) data->extent + elemsize
              >= (char *) &data->extent->filled + sizeof (data->extent->filled))
            data->extend =
              data->extstart + grub_le_to_cpu64 (data->extent->filled);
++++++ grub2-vbe-blacklist-preferred-1440x900x32.patch ++++++
Index: grub-2.02~beta2/grub-core/video/i386/pc/vbe.c
===================================================================
--- grub-2.02~beta2.orig/grub-core/video/i386/pc/vbe.c
+++ grub-2.02~beta2/grub-core/video/i386/pc/vbe.c
@@ -1053,6 +1053,15 @@ grub_video_vbe_setup (unsigned int width
              || vbe_mode_info.y_resolution > height)
            /* Resolution exceeds that of preferred mode.  */
            continue;
+
+         /* Blacklist 1440x900x32 from preferred mode handling until a
+            better solution is available.  This mode causes problems on
+            many Thinkpads.
+          */
+         if (vbe_mode_info.x_resolution == 1440 &&
+             vbe_mode_info.y_resolution == 900 &&
+             vbe_mode_info.bits_per_pixel == 32)
+           continue;
        }
       else
        {
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to