rpms/yaboot/F-12 yaboot-1.3.14-dont_of_open_native_partitions.patch, NONE, 1.1 yaboot.spec, 1.71, 1.72
Tony Breeds
tbreeds at fedoraproject.org
Mon Oct 19 01:12:44 UTC 2009
Author: tbreeds
Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15167
Modified Files:
yaboot.spec
Added Files:
yaboot-1.3.14-dont_of_open_native_partitions.patch
Log Message:
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/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- yaboot.spec 19 Oct 2009 01:03:26 -0000 1.71
+++ yaboot.spec 19 Oct 2009 01:12:43 -0000 1.72
@@ -1,7 +1,7 @@
Summary: Linux bootloader for Power Macintosh "New World" computers.
Name: yaboot
Version: 1.3.14
-Release: 21%{?dist}
+Release: 22%{?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
@@ -83,6 +85,7 @@ 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
@@ -123,6 +126,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
%changelog
+* Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-20
+- 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).
+
* Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-21
- Explicitly build a DEBUG=1 version of yaboot to aid in debugging
More information about the fedora-extras-commits
mailing list