rpms/yaboot/devel yaboot-1.3.13-pegasos-serial.patch, NONE, 1.1 yaboot.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31558

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.13-pegasos-serial.patch 
Log Message:
Fix pegasos serial console

yaboot-1.3.13-pegasos-serial.patch:
 prom.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE yaboot-1.3.13-pegasos-serial.patch ---
--- yaboot-1.3.13/second/prom.c~	2005-08-10 14:53:10.000000000 +0100
+++ yaboot-1.3.13/second/prom.c	2005-08-10 15:07:16.000000000 +0100
@@ -368,10 +368,8 @@ prom_getchar ()
      char c[4];
      int a;
 
-     while ((a = (int)call_prom ("read", 3, 1, prom_stdin, c, 4)) == 0)
+     while ((a = (int)call_prom ("read", 3, 1, prom_stdin, c, 4)) <= 0)
 	  ;
-     if (a == -1)
-	  prom_abort ("EOF on console\n");
      if (a == 3 && c[0] == '\e' && c[1] == '[')
 	  return 0x100 | c[2];
      return c[0];


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- yaboot.spec	9 Aug 2005 15:58:35 -0000	1.18
+++ yaboot.spec	10 Aug 2005 14:21:54 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.5
+Release: 0.6
 License: GPL
 Group: System Environment/Base
 Source: http://penguinppc.org/bootloaders/yaboot/yaboot-%{version}.tar.gz
@@ -25,6 +25,7 @@
 Patch18: yaboot-1.3.13-pegasos-ext2.patch
 Patch19: yaboot-1.3.13-confarg.patch
 Patch20: yaboot-1.3.13-ofpath-pegasos.patch
+Patch21: yaboot-1.3.13-pegasos-serial.patch
 
 URL: http://penguinppc.org/bootloaders/yaboot/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -60,6 +61,7 @@
 %patch18 -p1 -b .ext2
 %patch19 -p1 -b .confarg
 %patch20 -p1 -b .ofpath
+%patch21 -p1 -b .pegasos-serial
 
 %build
 make
@@ -93,6 +95,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Tue Aug  9 2005 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-0.6
+- Fix handling of prom 'read' method, to make Pegasos serial work
+
 * Tue Aug  9 2005 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-0.5
 - Fix Pegasos partition hack