rpms/grub/devel grub.spec,1.64,1.65 grub-fedora-9.patch,1.3,1.4

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9492

Modified Files:
	grub.spec grub-fedora-9.patch 
Log Message:
Update to -24



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- grub.spec	27 Feb 2008 16:08:23 -0000	1.64
+++ grub.spec	27 Feb 2008 21:39:13 -0000	1.65
@@ -1,13 +1,13 @@
 Name: grub
 Version: 0.97
-Release: 23%{?dist}
+Release: 24%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
 
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64 ia64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
-BuildRequires: autoconf /usr/lib/crt1.o automake
+BuildRequires: autoconf /usr/lib/crt1.o automake gnu-efi
 PreReq: /sbin/install-info
 Requires: mktemp
 Requires: /usr/bin/cmp
@@ -87,6 +87,9 @@
 #/sbin/grub-efi
 
 %changelog
+* Wed Feb 27 2008 Peter Jones <pjones at redhat.com> - 0.97-24
+- Fix build of xfs code on amd64.
+
 * Wed Feb 27 2008 Peter Jones <pjones at redhat.com> - 0.97-23
 - Enable EFI on i386, update to newest git head.
 

grub-fedora-9.patch:

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub-fedora-9.patch	27 Feb 2008 16:08:23 -0000	1.3
+++ grub-fedora-9.patch	27 Feb 2008 21:39:13 -0000	1.4
@@ -38632,7 +38632,7 @@
      }
    
 diff --git a/stage2/fsys_xfs.c b/stage2/fsys_xfs.c
-index 76c4c13..80c2383 100644
+index 76c4c13..1c01c3b 100644
 --- a/stage2/fsys_xfs.c
 +++ b/stage2/fsys_xfs.c
 @@ -97,8 +97,8 @@ ino2offset (xfs_ino_t ino)
@@ -38668,6 +38668,22 @@
  le64 (xfs_uint64_t x)
  {
  	xfs_uint32_t h = x >> 32;
+@@ -187,12 +187,12 @@ fsb2daddr (xfs_fsblock_t fsbno)
+ }
+ 
+ #undef offsetof
+-#define offsetof(t,m)	((int)&(((t *)0)->m))
++#define offsetof(t,m) __builtin_offsetof(t, m)
+ 
+-static inline int
++static inline xfs_uint64_t
+ btroot_maxrecs (void)
+ {
+-	int tmp = icore.di_forkoff ? (icore.di_forkoff << 3) : xfs.isize;
++	xfs_uint64_t tmp = icore.di_forkoff ? (icore.di_forkoff << 3) : xfs.isize;
+ 
+ 	return (tmp - sizeof(xfs_bmdr_block_t) - offsetof(xfs_dinode_t, di_u)) /
+ 		(sizeof (xfs_bmbt_key_t) + sizeof (xfs_bmbt_ptr_t));
 @@ -334,7 +334,7 @@ next_dentry (xfs_ino_t *ino)
  {
  	int namelen = 1;