rpms/yaboot/devel yaboot-1.3.14-dont_of_open_native_partitions.patch, NONE, 1.1 yaboot.spec, 1.68, 1.69

[Roman Rakus]

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17587

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-dont_of_open_native_partitions.patch 
Log Message:
Only require hfsutils on fedora and rhel <= 5
Explicitly build a DEBUG=1 version of yaboot to aid in debugging
Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a garbage file.  Add check to of_open to skip these parttions (#526021).


yaboot-1.3.14-dont_of_open_native_partitions.patch:
 .fs_of.c.swp |binary
 fs_of.c      |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE yaboot-1.3.14-dont_of_open_native_partitions.patch ---
diff -urNp yaboot-1.3.14.orig/second/fs_of.c yaboot-1.3.14/second/fs_of.c
--- yaboot-1.3.14.orig/second/fs_of.c	2009-10-14 09:39:46.263661071 +1100
+++ yaboot-1.3.14/second/fs_of.c	2009-10-14 09:43:42.932691139 +1100
@@ -92,8 +92,8 @@ of_open(struct boot_file_t* file,
      strncpy(buffer, fspec->dev, 768);
      strcat(buffer, ":");
      if (part) {
-          if (part->sys_ind == LINUX_RAID) {
-	       DEBUG_F("skipping because partition is marked LINUX_RAID\n");
+          if (part->sys_ind == LINUX_RAID || part->sys_ind == LINUX_NATIVE) {
+	       DEBUG_F("skipping because partition is marked %x\n", part->sys_ind);
 	       DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
 	       return FILE_ERR_BAD_FSYS;
 	  }
Binary files yaboot-1.3.14.orig/second/.fs_of.c.swp and yaboot-1.3.14/second/.fs_of.c.swp differ


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- yaboot.spec	24 Sep 2009 12:16:42 -0000	1.68
+++ yaboot.spec	19 Oct 2009 12:44:27 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -34,6 +34,8 @@ Patch35: yaboot-1.3.14-returns.patch
 # ipv6 support
 Patch36: yaboot-1.3.14-ipv6.patch
 
+# Do not open LINUX_NATIVE parttions with OF, as badness happens
+Patch37: yaboot-1.3.14-dont_of_open_native_partitions.patch
 
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -42,7 +44,7 @@ ExclusiveArch: ppc
 
 # hfsutils will not be in RHEL6.
 # hfsutils is needed only for non-IBM ppc machines
-%if ! 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} < 6
 Requires: hfsutils
 %endif
 BuildRequires: e2fsprogs-devel
@@ -83,8 +85,12 @@ yaboot can also bootload IBM pSeries mac
 %patch34 -p1 -b .birecs
 %patch35 -p1 -b .returns
 %patch36 -p1 -b .ipv6
+%patch37 -p1 -b .partitions
 
 %build
+make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
+cp -a second/yaboot{,.debug}
+make clean
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
 
 %install
@@ -93,6 +99,7 @@ rm -f $RPM_BUILD_ROOT/etc/yaboot.conf
 touch $RPM_BUILD_ROOT/etc/yaboot.conf
 mkdir -p $RPM_BUILD_ROOT/boot
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT/boot/efika.forth
+install -m0644 second/yaboot.debug $RPM_BUILD_ROOT/usr/lib/yaboot/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/yaboot/addnote
 /usr/lib/yaboot/ofboot
 /usr/lib/yaboot/yaboot
+/usr/lib/yaboot/yaboot.debug
 %{_mandir}/man8/bootstrap.8.gz
 %{_mandir}/man8/mkofboot.8.gz
 %{_mandir}/man8/ofpath.8.gz
@@ -118,7 +126,13 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
-* Thu Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-19
+* Mon Oct 19 2009 Roman Rakus <rrakus at redhat.com> - 1.3.13-20
+- Only require hfsutils on fedora and rhel <= 5
+- Explicitly build a DEBUG=1 version of yaboot to aid in debugging
+- Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a
+  garbage file.  Add check to of_open to skip these parttions (#526021).
+
+* Thu Sep 10 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-19
 - Increase TFTP buffer to 32MB
 
 * Wed Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-18