Mailinglist Archive: opensuse-commit (832 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package grub for openSUSE:Factory
checked in at Fri Feb 5 14:36:59 CET 2010.



--------
--- grub/grub.changes   2009-11-15 11:25:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/grub/grub.changes      2010-01-25 
14:48:42.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Jan 25 12:46:48 CET 2010 - tiwai@xxxxxxx
+
+- fix the truncation of boot options in 256 chars with gfx menu
+  (bnc#573453)
+
+-------------------------------------------------------------------
+Sun Jan 24 11:00:21 CET 2010 - jdelvare@xxxxxxx
+
+- Stop copying /usr/lib/grub/*/*stage1* during post-install, there
+  are no files there, and this can cause confusion when debugging
+  (see bnc#513821#c128).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  stage2-gfx-cmdline-len-fix.diff

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

Other differences:
------------------
++++++ grub.spec ++++++
--- /var/tmp/diff_new_pack.garz53/_old  2010-02-05 14:36:28.000000000 +0100
+++ /var/tmp/diff_new_pack.garz53/_new  2010-02-05 14:36:28.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub (Version 0.97)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,10 +25,10 @@
 %else
 BuildRequires:  gcc glibc-devel libncurses5 ncurses-devel
 %endif
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          System/Boot
 Version:        0.97
-Release:        162
+Release:        163
 Source0:        %{name}-%{version}.tar.gz
 Source1:        installgrub
 Source2:        grubonce
@@ -67,6 +67,7 @@
 Patch31:        string-ops-fix
 Patch39:        document-grub-install.unsupported
 Patch40:        grub-iso-fixes
+Patch41:        stage2-gfx-cmdline-len-fix.diff
 Url:            http://www.gnu.org/software/grub/grub.en.html
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Grand Unified Boot Loader
@@ -139,6 +140,7 @@
 %patch31 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
 
 %build
 perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi
@@ -219,7 +221,6 @@
 [ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old}
 # copy especially stage2 over, because it will be modified in-place !
 cp -p /usr/lib/grub/*stage1*   /boot/grub 2>/dev/null || true
-cp -p /usr/lib/grub/*/*stage1* /boot/grub 2>/dev/null || true
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/multiboot.info.gz
 #special hack for #46843

++++++ stage2-gfx-cmdline-len-fix.diff ++++++
---
 stage2/stage2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/stage2/stage2.c
+++ b/stage2/stage2.c
@@ -1001,7 +1001,7 @@
 
   /* setup command line edit buffer */
 
-  gfx_data->cmdline_len = 256;
+  gfx_data->cmdline_len = 2048; /* FIXME! should be configuratble? */
 
   gfx_data->cmdline = heap;
   heap += gfx_data->cmdline_len;

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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx