[gentoo-commits] gentoo commit in src/patchsets/grub/0.97: 015_all_grub-0.96-unsigned-addresses.patch 021_all_grub-0.97-grub-special_device_names.patch 040_all_grub-0.96-nxstack.patch 070_all_grub-0.97-initrd_max_address.patch 080_all_grub-0.97-geometry-26kernel.patch 090_all_grub-0.97-intelmac.patch 600_all_grub-0.97-gpt-partition-table.patch 700_all_grub-0.97-grub-install_addsyncs.patch 710_all_grub-0.97-grub-install_regexp.patch 720_all_grub-0.97-grub-install_aoe_support.patch 800_all_grub-0.97-crossreference_manpages.patch 810_all_grub-0.97-ext3_256byte_inode.patch README-DEBIAN-PATCHES

[Robin H. Johnson (robbat2)]

robbat2     08/03/25 06:11:53

  Modified:             015_all_grub-0.96-unsigned-addresses.patch
                        021_all_grub-0.97-grub-special_device_names.patch
                        040_all_grub-0.96-nxstack.patch
                        070_all_grub-0.97-initrd_max_address.patch
                        080_all_grub-0.97-geometry-26kernel.patch
                        090_all_grub-0.97-intelmac.patch
                        600_all_grub-0.97-gpt-partition-table.patch
  Added:                700_all_grub-0.97-grub-install_addsyncs.patch
                        710_all_grub-0.97-grub-install_regexp.patch
                        720_all_grub-0.97-grub-install_aoe_support.patch
                        800_all_grub-0.97-crossreference_manpages.patch
                        810_all_grub-0.97-ext3_256byte_inode.patch
                        README-DEBIAN-PATCHES
  Log:
  Add all the patches for grub-0.97-r5.

Revision  Changes    Path
1.2                  src/patchsets/grub/0.97/015_all_grub-0.96-unsigned-addresses.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/015_all_grub-0.96-unsigned-addresses.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/015_all_grub-0.96-unsigned-addresses.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/015_all_grub-0.96-unsigned-addresses.patch?r1=1.1&r2=1.2

Index: 015_all_grub-0.96-unsigned-addresses.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/015_all_grub-0.96-unsigned-addresses.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- 015_all_grub-0.96-unsigned-addresses.patch	8 Nov 2005 02:49:51 -0000	1.1
+++ 015_all_grub-0.96-unsigned-addresses.patch	25 Mar 2008 06:11:53 -0000	1.2
@@ -1,9 +1,10 @@
+Upstream-Bug: http://savannah.gnu.org/bugs/?func=detailitem&item_id=9954
+Gentoo-Bug: http://bugs.gentoo.org/99897
+Debian-Patch: 2gb_limit.diff
+
 Patch from upstream bug tracker to fix memory checks on systems with a lot of 
 ram (like 2G+, sizes that overflow a signed integer).
 
-http://savannah.gnu.org/bugs/?func=detailitem&item_id=9954
-http://bugs.gentoo.org/99897
-
 --- grub-0.97/stage2/char_io.c
 +++ grub-0.97/stage2/char_io.c
 @@ -1214,7 +1214,7 @@ grub_strlen (const char *str)



1.2                  src/patchsets/grub/0.97/021_all_grub-0.97-grub-special_device_names.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/021_all_grub-0.97-grub-special_device_names.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/021_all_grub-0.97-grub-special_device_names.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/021_all_grub-0.97-grub-special_device_names.patch?r1=1.1&r2=1.2

Index: 021_all_grub-0.97-grub-special_device_names.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/021_all_grub-0.97-grub-special_device_names.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- 021_all_grub-0.97-grub-special_device_names.patch	8 Sep 2006 05:47:25 -0000	1.1
+++ 021_all_grub-0.97-grub-special_device_names.patch	25 Mar 2008 06:11:53 -0000	1.2
@@ -1,3 +1,5 @@
+Debian-Patch: grub-special_device_names.diff
+
 --- trunk/lib/device.c.old	2006-06-24 17:36:59.248122032 +0200
 +++ trunk/lib/device.c	2006-06-24 17:38:52.999829144 +0200
 @@ -1115,6 +1115,8 @@



1.5                  src/patchsets/grub/0.97/040_all_grub-0.96-nxstack.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/040_all_grub-0.96-nxstack.patch?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/040_all_grub-0.96-nxstack.patch?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/040_all_grub-0.96-nxstack.patch?r1=1.4&r2=1.5

Index: 040_all_grub-0.96-nxstack.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/040_all_grub-0.96-nxstack.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -w -b -B -u -u -r1.4 -r1.5
--- 040_all_grub-0.96-nxstack.patch	20 Jul 2006 01:23:53 -0000	1.4
+++ 040_all_grub-0.96-nxstack.patch	25 Mar 2008 06:11:53 -0000	1.5
@@ -1,3 +1,5 @@
+Debian-Patch: mprotect.diff (older version)
+
 Fix NX segfaulting on amd64.
 
 Patch by Peter Jones.



1.2                  src/patchsets/grub/0.97/070_all_grub-0.97-initrd_max_address.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/070_all_grub-0.97-initrd_max_address.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/070_all_grub-0.97-initrd_max_address.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/070_all_grub-0.97-initrd_max_address.patch?r1=1.1&r2=1.2

Index: 070_all_grub-0.97-initrd_max_address.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/070_all_grub-0.97-initrd_max_address.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- 070_all_grub-0.97-initrd_max_address.patch	8 Sep 2006 05:47:25 -0000	1.1
+++ 070_all_grub-0.97-initrd_max_address.patch	25 Mar 2008 06:11:53 -0000	1.2
@@ -1,3 +1,4 @@
+Debian-Patch: initrd_max_address.diff
 
     Date: 2005-11-11
     Author: Otavio Salvador



1.2                  src/patchsets/grub/0.97/080_all_grub-0.97-geometry-26kernel.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/080_all_grub-0.97-geometry-26kernel.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/080_all_grub-0.97-geometry-26kernel.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/080_all_grub-0.97-geometry-26kernel.patch?r1=1.1&r2=1.2

Index: 080_all_grub-0.97-geometry-26kernel.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/080_all_grub-0.97-geometry-26kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- 080_all_grub-0.97-geometry-26kernel.patch	8 Sep 2006 05:47:25 -0000	1.1
+++ 080_all_grub-0.97-geometry-26kernel.patch	25 Mar 2008 06:11:53 -0000	1.2
@@ -1,3 +1,4 @@
+Debian-Patch: geometry-26kernel.diff
 
     Date: 2005-11-11
     Author: Otavio Salvador



1.2                  src/patchsets/grub/0.97/090_all_grub-0.97-intelmac.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/090_all_grub-0.97-intelmac.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/090_all_grub-0.97-intelmac.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/090_all_grub-0.97-intelmac.patch?r1=1.1&r2=1.2

Index: 090_all_grub-0.97-intelmac.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/090_all_grub-0.97-intelmac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- 090_all_grub-0.97-intelmac.patch	8 Sep 2006 05:47:25 -0000	1.1
+++ 090_all_grub-0.97-intelmac.patch	25 Mar 2008 06:11:53 -0000	1.2
@@ -1,3 +1,4 @@
+Debian-Patch: intelmac.diff
 --- grub-0.97.orig/stage2/asm.S	2004-06-19 18:55:22.000000000 +0200
 +++ grub-0.97/stage2/asm.S	2006-04-21 11:10:52.000000000 +0200
 @@ -1651,7 +1651,29 @@



1.2                  src/patchsets/grub/0.97/600_all_grub-0.97-gpt-partition-table.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/600_all_grub-0.97-gpt-partition-table.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/600_all_grub-0.97-gpt-partition-table.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/600_all_grub-0.97-gpt-partition-table.patch?r1=1.1&r2=1.2

Index: 600_all_grub-0.97-gpt-partition-table.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/grub/0.97/600_all_grub-0.97-gpt-partition-table.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- 600_all_grub-0.97-gpt-partition-table.patch	1 Mar 2008 21:06:47 -0000	1.1
+++ 600_all_grub-0.97-gpt-partition-table.patch	25 Mar 2008 06:11:53 -0000	1.2
@@ -4,6 +4,8 @@ This was originally posted at http://www
 but it contained a couple of misplaced braces after where statements, causing
 the intended bodies of the while statements to never execute.
 
+Signed-off-by: Robin H. Johnson <robbat2@g.o>
+
 diff -Nuar --exclude '*.orig' grub-0.97.orig/stage2/builtins.c grub-0.97/stage2/builtins.c
 --- grub-0.97.orig/stage2/builtins.c	2008-02-29 18:14:44.646824000 -0800
 +++ grub-0.97/stage2/builtins.c	2008-02-29 18:18:49.442695487 -0800



1.1                  src/patchsets/grub/0.97/700_all_grub-0.97-grub-install_addsyncs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/700_all_grub-0.97-grub-install_addsyncs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/700_all_grub-0.97-grub-install_addsyncs.patch?rev=1.1&content-type=text/plain

Index: 700_all_grub-0.97-grub-install_addsyncs.patch
===================================================================
Debian-Patch: grub-install_addsyncs.diff

    Date: 2005-11-11
    Author: Otavio Salvador
    Comment: Stolen from Fedora grub package.
     Add syncs to ensure that filesystem cache are flushed.

 -- Original comment, bellow

I just found another semi-critical bug, whose fix should really get
into 0.91.

It turns out that "grub-install" doesn't have any "sync" calls to make
sure any filesystem caches are coherent with the raw devices they are
on top of...  so if your filesystem waits to write out any data from the
copy command in the script to put the "stage1" and "stage2" in their
final location, you're hosed.

I found this because it just bit me on one of my systems running stock
RedHat 7.2 with a large "stage2".

The only script that is patched here is "grub-install".  The others
don't appear to need it as they either unmount things first or don't
refer to devices.

Hmm.  Maybe the right fix is to make the "sync" system call when
starting the GRUB shell with a device map that refers to any real disks
or something like that.

    Erich Stefan Boleyn     <erich@××××.org>     http://www.uruk.org/
"Reality is truly stranger than fiction; Probably why fiction is so popular"

--- grub-0.94/util/grub-install.in.addsync	2004-02-02 17:22:26.672520324 -0500
+++ grub-0.94/util/grub-install.in	2004-02-02 17:23:16.147712327 -0500
@@ -351,6 +351,10 @@
     # Create a safe temporary file.
     test -n "$mklog" && log_file=`$mklog`
 
+    # Before all invocations of the grub shell, call sync to make sure
+    # the raw device is in sync with any bufferring in filesystems.
+    sync
+ 
     $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
 quit
 EOF
@@ -457,6 +461,10 @@
 # Create a safe temporary file.
 test -n "$mklog" && log_file=`$mklog`
 
+# Before all invocations of the grub shell, call sync to make sure
+# the raw device is in sync with any bufferring in filesystems.
+sync
+
 # Now perform the installation.
 $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
 root $root_drive



1.1                  src/patchsets/grub/0.97/710_all_grub-0.97-grub-install_regexp.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/710_all_grub-0.97-grub-install_regexp.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/710_all_grub-0.97-grub-install_regexp.patch?rev=1.1&content-type=text/plain

Index: 710_all_grub-0.97-grub-install_regexp.patch
===================================================================
Debian-Patch: grub-install_regexp.diff
--- a/util/grub-install.in~	2004-07-24 15:57:31.000000000 -0300
+++ b/util/grub-install.in	2006-04-17 08:59:54.000000000 -0300
@@ -131,7 +131,7 @@
 
     # Get the drive name.
     tmp_drive=`grep -v '^#' $device_map | grep "$tmp_disk *$" \
-	| sed 's%.*\(([hf]d[0-9][a-g0-9,]*)\).*%\1%'`
+	| sed 's%.*\(([hf]d[0-9][a-z0-9,]*)\).*%\1%'`
 
     # If not found, print an error message and exit.
     if test "x$tmp_drive" = x; then
@@ -148,13 +148,13 @@
 	gnu*)
 	    if echo $tmp_part | grep "^s" >/dev/null; then
 		tmp_pc_slice=`echo $tmp_part \
-		    | sed "s%s\([0-9]*\)[a-g]*$%\1%"`
+		    | sed "s%s\([0-9]*\)[a-z]*$%\1%"`
 		tmp_drive=`echo "$tmp_drive" \
 		    | sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"`
 	    fi
-	    if echo $tmp_part | grep "[a-g]$" >/dev/null; then
+	    if echo $tmp_part | grep "[a-z]$" >/dev/null; then
 		tmp_bsd_partition=`echo "$tmp_part" \
-		    | sed "s%[^a-g]*\([a-g]\)$%\1%"`
+		    | sed "s%[^a-z]*\([a-z]\)$%\1%"`
 		tmp_drive=`echo "$tmp_drive" \
 		    | sed "s%)%,$tmp_bsd_partition)%"`
 	    fi



1.1                  src/patchsets/grub/0.97/720_all_grub-0.97-grub-install_aoe_support.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/720_all_grub-0.97-grub-install_aoe_support.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/720_all_grub-0.97-grub-install_aoe_support.patch?rev=1.1&content-type=text/plain

Index: 720_all_grub-0.97-grub-install_aoe_support.patch
===================================================================
Debian-Patch: grub-install_aoe_support.diff
diff -Nur grub-0.97-orig/util/grub-install.in grub-0.97/util/grub-install.in
--- grub-0.97-orig/util/grub-install.in	2006-07-10 17:39:19.000000000 -0300
+++ grub-0.97/util/grub-install.in	2006-07-10 17:28:51.000000000 -0300
@@ -148,13 +148,16 @@
 				  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
 				  -e 's%\(fd[0-9]*\)$%\1%' \
 				  -e 's%/part[0-9]*$%/disc%' \
-				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
+				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
+				  -e 's%\(e[0-9]\.[0-9]*\).*$%\1%'`
 	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
 				  -e 's%.*d[0-9]*p%%' \
 				  -e 's%.*/fd[0-9]*$%%' \
 				  -e 's%.*/floppy/[0-9]*$%%' \
 				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
-				  -e 's%.*c[0-7]d[0-9]*p%%'`
+				  -e 's%.*c[0-7]d[0-9]*p*%%' \
+				  -e 's%.*e[0-9]\.[0-9]*p%%' \
+				  -e 's%.*e[0-9]\.[0-9]*\$%%'`
 	;;
     gnu*)
 	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`



1.1                  src/patchsets/grub/0.97/800_all_grub-0.97-crossreference_manpages.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/800_all_grub-0.97-crossreference_manpages.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/800_all_grub-0.97-crossreference_manpages.patch?rev=1.1&content-type=text/plain

Index: 800_all_grub-0.97-crossreference_manpages.patch
===================================================================
Debian-Patch: crossreference_manpages.diff 
Index: current/docs/help2man
===================================================================
--- current/docs/help2man	(revision 414)
+++ current/docs/help2man	(working copy)
@@ -455,7 +455,9 @@
     $include{$sect} .= <<EOT;
 The full documentation for
 .B $program
-is maintained as a Texinfo manual.  If the
+is maintained as a Texinfo manual in the
+.B grub-doc
+package.  If the
 .B info
 and
 .B $program
Index: current/docs/Makefile.am
===================================================================
--- current/docs/Makefile.am	(revision 414)
+++ current/docs/Makefile.am	(working copy)
@@ -37,14 +37,14 @@
 	$(SHELL) $(srcdir)/$(SRC2TEXI) $(srcdir) $< $@
 
 if MAINTAINER_MODE
-$(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN)
+$(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN) $(srcdir)/grub.8.additions
 	$(PERL) $(srcdir)/$(HELP2MAN) --name="the grub shell" \
-		--section=8 --output=$@ $<
+		--section=8 --include=$@.additions --output=$@ $<
 
-$(srcdir)/grub-install.8: ../util/grub-install $(srcdir)/$(HELP2MAN)
+$(srcdir)/grub-install.8: ../util/grub-install $(srcdir)/$(HELP2MAN)  $(srcdir)/grub-install.8.additions
 	chmod 755 $<
 	$(PERL) $(srcdir)/$(HELP2MAN) --name="install GRUB on your drive" \
-		--section=8 --output=$@ $<
+		--section=8 --include=$@.additions --output=$@ $<
 
 $(srcdir)/mbchk.1: ../util/mbchk $(srcdir)/$(HELP2MAN)
 	$(PERL) $(srcdir)/$(HELP2MAN) \
Index: current/docs/grub.8.additions
===================================================================
--- current/docs/grub.8.additions	(revision 0)
+++ current/docs/grub.8.additions	(revision 0)
@@ -0,0 +1,3 @@
+[SEE ALSO]
+.BR update-grub (8),
+.BR grub-install (8).
Index: current/docs/grub-install.8.additions
===================================================================
--- current/docs/grub-install.8.additions	(revision 0)
+++ current/docs/grub-install.8.additions	(revision 0)
@@ -0,0 +1,3 @@
+[SEE ALSO]
+.BR grub (8),
+.BR update-grub (8).



1.1                  src/patchsets/grub/0.97/810_all_grub-0.97-ext3_256byte_inode.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/810_all_grub-0.97-ext3_256byte_inode.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/810_all_grub-0.97-ext3_256byte_inode.patch?rev=1.1&content-type=text/plain

Index: 810_all_grub-0.97-ext3_256byte_inode.patch
===================================================================
Debian-Patch: ext3_256byte_inode.diff

Patch from Red Hat. See #463236, #463123.

diff -Nrup a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c
--- a/stage2/fsys_ext2fs.c	2004-08-08 20:19:18.000000000 +0200
+++ b/stage2/fsys_ext2fs.c	2008-01-30 14:27:20.000000000 +0100
@@ -79,7 +79,52 @@ struct ext2_super_block
     __u32 s_rev_level;		/* Revision level */
     __u16 s_def_resuid;		/* Default uid for reserved blocks */
     __u16 s_def_resgid;		/* Default gid for reserved blocks */
-    __u32 s_reserved[235];	/* Padding to the end of the block */
+    /*
+     * These fields are for EXT2_DYNAMIC_REV superblocks only.
+     *
+     * Note: the difference between the compatible feature set and
+     * the incompatible feature set is that if there is a bit set
+     * in the incompatible feature set that the kernel doesn't
+     * know about, it should refuse to mount the filesystem.
+     *
+     * e2fsck's requirements are more strict; if it doesn't know
+     * about a feature in either the compatible or incompatible
+     * feature set, it must abort and not try to meddle with
+     * things it doesn't understand...
+     */
+    __u32 s_first_ino;		/* First non-reserved inode */
+    __u16 s_inode_size;		/* size of inode structure */
+    __u16 s_block_group_nr;	/* block group # of this superblock */
+    __u32 s_feature_compat;	/* compatible feature set */
+    __u32 s_feature_incompat;	/* incompatible feature set */
+    __u32 s_feature_ro_compat;	/* readonly-compatible feature set */
+    __u8  s_uuid[16];		/* 128-bit uuid for volume */
+    char  s_volume_name[16];	/* volume name */
+    char  s_last_mounted[64];	/* directory where last mounted */
+    __u32 s_algorithm_usage_bitmap; /* For compression */
+    /*
+     * Performance hints.  Directory preallocation should only
+     * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
+     */
+    __u8  s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
+    __u8  s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
+    __u16 s_reserved_gdt_blocks;/* Per group table for online growth */
+    /*
+     * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
+     */
+    __u8 s_journal_uuid[16];	/* uuid of journal superblock */
+    __u32 s_journal_inum;	/* inode number of journal file */
+    __u32 s_journal_dev;	/* device number of journal file */
+    __u32 s_last_orphan;	/* start of list of inodes to delete */
+    __u32 s_hash_seed[4];	/* HTREE hash seed */
+    __u8  s_def_hash_version;	/* Default hash version to use */
+    __u8  s_jnl_backup_type; 	/* Default type of journal backup */
+    __u16 s_reserved_word_pad;
+    __u32 s_default_mount_opts;
+    __u32 s_first_meta_bg;	/* First metablock group */
+    __u32 s_mkfs_time;		/* When the filesystem was created */
+    __u32 s_jnl_blocks[17]; 	/* Backup of the journal inode */
+    __u32 s_reserved[172];	/* Padding to the end of the block */
   };
 
 struct ext2_group_desc
@@ -218,6 +263,9 @@ struct ext2_dir_entry
 #define EXT2_ADDR_PER_BLOCK(s)          (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
 #define EXT2_ADDR_PER_BLOCK_BITS(s)		(log2(EXT2_ADDR_PER_BLOCK(s)))
 
+#define EXT2_INODE_SIZE(s)		(SUPERBLOCK->s_inode_size)
+#define EXT2_INODES_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
+
 /* linux/ext2_fs.h */
 #define EXT2_BLOCK_SIZE_BITS(s)        ((s)->s_log_block_size + 10)
 /* kind of from ext2/super.c */
@@ -553,7 +601,7 @@ ext2fs_dir (char *dirname)
       gdp = GROUP_DESC;
       ino_blk = gdp[desc].bg_inode_table +
 	(((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group))
-	 >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)));
+	 >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK)));
 #ifdef E2DEBUG
       printf ("inode table fsblock=%d\n", ino_blk);
 #endif /* E2DEBUG */
@@ -565,13 +613,12 @@ ext2fs_dir (char *dirname)
       /* reset indirect blocks! */
       mapblock2 = mapblock1 = -1;
 
-      raw_inode = INODE +
-	((current_ino - 1)
-	 & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1));
+      raw_inode = (struct ext2_inode *)((char *)INODE +
+	((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) *
+	EXT2_INODE_SIZE (SUPERBLOCK));
 #ifdef E2DEBUG
       printf ("ipb=%d, sizeof(inode)=%d\n",
-	      (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)),
-	      sizeof (struct ext2_inode));
+	      EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK));
       printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode);
       printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE);
       for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode;



1.1                  src/patchsets/grub/0.97/README-DEBIAN-PATCHES

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/README-DEBIAN-PATCHES?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/grub/0.97/README-DEBIAN-PATCHES?rev=1.1&content-type=text/plain

Index: README-DEBIAN-PATCHES
===================================================================
Several of the patches here have been borrowed from the Debian patchset.
At the time of writing, Debian Patchset 0.97-31 was the most recent.
Signed-off-by: Robin H. Johnson <robbat2@g.o>
Date: Tue, 25 Mar 2008 00:50:32 +0000

Included prior to Gentoo 0.97-r5:
---------------------------------
2gb_limit.diff
geometry-26kernel.patch
grub-special_device_names.diff
initrd_max_address.diff
intelmac.diff
mprotect.diff (older version)

Included as of Gentoo 0.97-r5:
------------------------------
crossreference_manpages.diff 
ext3_256byte_inode.diff
grub-install_addsyncs.diff
grub-install_aoe_support.diff
grub-install_regexp.diff

Not suitable for inclusion:
---------------------------
find-grub-dir.diff
fix_amd64_compile.diff
graphics.diff

Potential for future inclusion:
-------------------------------
cvs-sync.patch
kfreebsd.diff
menu.lst_gnu-hurd.diff
print_func.diff
raid_cciss.diff
raid.diff
savedefault.diff
splashimage_help.diff
xfs_freeze.diff



-- 
gentoo-commits@l.g.o mailing list