Sat Jul 24 15:32:41 UTC 2010

Author: ausil

Update of /cvs/pkgs/rpms/grub2/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20751

Modified Files:
	.cvsignore grub2.spec sources 
Added Files:
	grub-1.97.1-initramfs.patch 
	grub-1.98-follow-dev-mapper-symlinks.patch 
Removed Files:
	grub-1.95-grubdir.patch grub-1.96-garbage.patch 
	grub-1.97-cfgmode.patch grub-1.98-linuxsort.patch 
	grub-1.98-os.patch grub-1.98-persistent.patch 
	grub-1.98-prototypes.patch grub-1.98-transform.patch 
	grub2-dlsym-v4.patch grub2-preserve-symbols-v4.1.patch 
Log Message:
clean up patches update to match rawhide


grub-1.97.1-initramfs.patch:
 10_linux.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE grub-1.97.1-initramfs.patch ---
diff -uNr grub-1.97.1-orig/util/grub.d/10_linux.in grub-1.97.1/util/grub.d/10_linux.in
--- grub-1.97.1-orig/util/grub.d/10_linux.in	2009-11-09 09:48:16.000000000 -0600
+++ grub-1.97.1/util/grub.d/10_linux.in	2009-12-01 15:28:16.000000000 -0600
@@ -78,7 +78,8 @@
   initrd=
   for i in "initrd.img-${version}" "initrd-${version}.img" \
 	   "initrd-${version}" "initrd.img-${alt_version}" \
-	   "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+	   "initrd-${alt_version}.img" "initrd-${alt_version}" \
+           "initramfs-${version}.img" ; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
       break

grub-1.98-follow-dev-mapper-symlinks.patch:
 getroot.c |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE grub-1.98-follow-dev-mapper-symlinks.patch ---
--- a/util/getroot.c	2010-03-06 20:51:37.000000000 +0000
+++ b/util/getroot.c	2010-05-28 18:23:19.892788564 +0100
@@ -180,7 +180,8 @@ grub_get_prefix (const char *dir)
 
 static char *
 find_root_device (const char *dir __attribute__ ((unused)),
-                  dev_t dev __attribute__ ((unused)))
+                  dev_t dev __attribute__ ((unused))
+                  int depth __attribute__ ((unused)))
 {
   return 0;
 }
@@ -188,7 +189,7 @@ find_root_device (const char *dir __attr
 #elif ! defined(__CYGWIN__)
 
 static char *
-find_root_device (const char *dir, dev_t dev)
+find_root_device (const char *dir, dev_t dev, int depth)
 {
   DIR *dp;
   char *saved_cwd;
@@ -222,16 +223,27 @@ find_root_device (const char *dir, dev_t
 	/* Ignore any error.  */
 	continue;
 
-      if (S_ISLNK (st.st_mode))
+      if (S_ISLNK (st.st_mode)) {
+#ifdef __linux__
+	/* If we're in /dev/mapper, follow symbolic links. */
+	if (depth == 1 && strcmp(dir, "mapper") == 0) {
+		if (stat(ent->d_name, &st) == -1)
+		  continue;
+		if (S_ISDIR (st.st_mode))
+		  continue;
+	}
+#else
 	/* Don't follow symbolic links.  */
 	continue;
+#endif
+      }
 
       if (S_ISDIR (st.st_mode))
 	{
 	  /* Find it recursively.  */
 	  char *res;
 
-	  res = find_root_device (ent->d_name, dev);
+	  res = find_root_device (ent->d_name, dev, depth + 1);
 
 	  if (res)
 	    {
@@ -454,7 +466,7 @@ grub_guess_root_device (const char *dir)
 #else
 
   /* This might be truly slow, but is there any better way?  */
-  os_dev = find_root_device ("/dev", st.st_dev);
+  os_dev = find_root_device ("/dev", st.st_dev, 0);
 #endif
 #endif /* !__GNU__ */
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Nov 2009 21:00:35 -0000	1.3
+++ .cvsignore	24 Jul 2010 15:32:41 -0000	1.4
@@ -1 +1 @@
-grub-1.97.1.tar.gz
+grub-1.98.tar.gz


Index: grub2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/EL-6/grub2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- grub2.spec	10 Nov 2009 22:52:35 -0000	1.10
+++ grub2.spec	24 Jul 2010 15:32:41 -0000	1.11
@@ -13,7 +13,7 @@
 
 Name:           grub2
 Epoch:          1
-Version:        1.97.1
+Version:        1.98
 Release:        3%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
@@ -25,7 +25,8 @@ Source1:        90_persistent
 Source2:        grub.default
 Source3:        README.Fedora
 Patch0:         grub-1.95-grubdir.patch
-Patch1:        http://fedorapeople.org/~lkundrak/grub2/grub2-dlsym-v4.patch
+Patch1:         grub-1.97.1-initramfs.patch
+Patch2:         grub-1.98-follow-dev-mapper-symlinks.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,11 +38,11 @@ BuildRequires:  /usr/lib64/crt1.o glibc-
 %else
 BuildRequires:  /usr/lib/crt1.o glibc-static
 %endif
-BuildRequires:  autoconf automake
+BuildRequires:  autoconf automake gettext-devel
 
 # grubby
-Requires(pre):  mkinitrd dracut
-Requires(post): mkinitrd dracut
+Requires(pre):  dracut
+Requires(post): dracut
 
 # TODO: ppc
 ExclusiveArch:  %{ix86} x86_64 %{sparc}
@@ -63,7 +64,8 @@ file that is part of this package's docu
 %setup -q -n grub-%{version}
 
 %patch0 -p1 -b .grubdir
-%patch1 -p1 -b .dlsym
+%patch1 -p1 -b .initramfs
+%patch2 -p1 -b .follow-symlinks
 
 # README.Fedora
 cp %{SOURCE3} .
@@ -79,7 +81,6 @@ sh autogen.sh
 %else
         --with-platform=pc              \
 %endif
-        --enable-grub-emu               \
         --program-transform-name=s,grub,%{name},
 # TODO: Other platforms. Use alternatives system?
 #       --with-platform=ieee1275        \
@@ -93,7 +94,6 @@ make %{?_smp_mflags}
 #include/grub/script.h:26:29: error: grub_script.tab.h: No such file or directory
 #make
 
-
 %install
 set -e
 rm -fr $RPM_BUILD_ROOT
@@ -124,6 +124,7 @@ done
 # Defaults
 install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
 
+%find_lang grub
 
 %clean    
 rm -rf $RPM_BUILD_ROOT
@@ -157,30 +158,36 @@ rm -f /boot/%{name}/device.map
 %triggerin -- kernel, kernel-PAE
 exec >/dev/null 2>&1
 # Generate grub.cfg
-%{name}-mkconfig
+%{name}-mkconfig -o /boot/grub2/grub.cfg
 
 
 %triggerun -- kernel, kernel-PAE
 exec >/dev/null 2>&1
 # Generate grub.cfg
-%{name}-mkconfig
+%{name}-mkconfig -o /boot/grub2/grub.cfg
 
 
-%files
+%files -f grub.lang
 %defattr(-,root,root,-)
 %{_libdir}/%{name}
 %{_libdir}/grub/
 %{_sbindir}/%{name}-mkdevicemap
 %{_sbindir}/%{name}-install
-%{_sbindir}/%{name}-emu
 %{_sbindir}/%{name}-probe
 %{_sbindir}/%{name}-setup
 %{_sbindir}/%{name}-mkconfig
+%{_sbindir}/%{name}-reboot
+%{_sbindir}/%{name}-set-default
 %{_bindir}/%{name}-mkimage
 %{_bindir}/%{name}-mkelfimage
 %{_bindir}/%{name}-editenv
 %{_bindir}/%{name}-fstest
 %{_bindir}/%{name}-mkfont
+%{_bindir}/%{name}-bin2h
+%{_bindir}/%{name}-mkisofs
+%{_bindir}/%{name}-mkpasswd-pbkdf2
+%{_bindir}/%{name}-mkrelpath
+%{_bindir}/%{name}-script-check
 %ifnarch %{sparc}
 %{_bindir}/%{name}-mkrescue
 %endif
@@ -202,6 +209,24 @@ exec >/dev/null 2>&1
 
 
 %changelog
+* Sat Jul 17 2010 Dennis Gilmore <dennis at ausil.us> - 1:1.98-3
+- correctly generate a grub.cfg on kernel update
+
+* Fri May 28 2010 Dennis Gilmore <dennis at ausil.us> - 1:1.98-2
+- add patch so grub2-probe works with lvm to detect devices correctly
+
+* Wed Apr 21 2010 Dennis Gilmore <dennis at ausil.us> - 1:1.98-1
+- update to 1.98
+
+* Fri Feb 12 2010 Dennis Gilmore <dennis at ausil.us> - 1:1.97.2-1
+- update to 1.97.2
+
+* Wed Jan 20 2010 Dennis Gilmore <dennis at ausil.us> - 1:1.97.1-5
+- drop requires on mkinitrd
+
+* Tue Dec 01 2009 Dennis Gilmore <dennis at ausil.us> - 1:1.97.1-4
+- add patch so that grub2 finds fedora's initramfs
+
 * Tue Nov 10 2009 Dennis Gilmore <dennis at ausil.us> - 1:1.97.1-3
 - no mkrescue on sparc arches
 - ofpathname on sparc arches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grub2/EL-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Nov 2009 21:00:35 -0000	1.5
+++ sources	24 Jul 2010 15:32:41 -0000	1.6
@@ -1 +1 @@
-66fe18cd9318e3d67a34d7b7a8e7b1f6  grub-1.97.1.tar.gz
+c0bcf60e524739bb64e3a2d4e3732a59  grub-1.98.tar.gz


--- grub-1.95-grubdir.patch DELETED ---


--- grub-1.96-garbage.patch DELETED ---


--- grub-1.97-cfgmode.patch DELETED ---


--- grub-1.98-linuxsort.patch DELETED ---


--- grub-1.98-os.patch DELETED ---


--- grub-1.98-persistent.patch DELETED ---


--- grub-1.98-prototypes.patch DELETED ---


--- grub-1.98-transform.patch DELETED ---


--- grub2-dlsym-v4.patch DELETED ---


--- grub2-preserve-symbols-v4.1.patch DELETED ---

