rpms/yaboot/devel efika.forth, 1.1, 1.2 yaboot-1.3.13-bplan.patch, 1.1, 1.2 yaboot.spec, 1.43, 1.44

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/yaboot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18662

Modified Files:
	efika.forth yaboot-1.3.13-bplan.patch yaboot.spec 
Log Message:
more efika fixes


Index: efika.forth
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/efika.forth,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- efika.forth	27 Nov 2007 20:13:22 -0000	1.1
+++ efika.forth	28 Nov 2007 13:20:47 -0000	1.2
@@ -96,7 +96,7 @@
 
 \ New USB binding - change one of the numbers here to disable it for older kernels
 \ as this is a destructive change
-1 1 = if
+0 1 = if
 s" /builtin/usb" find-device
 	s" usb-ohci" device-type
 	s" " encode-string s" big-endian" property
@@ -333,4 +333,4 @@
 finish-device
 
 \ Optionally uncomment and boot your Linux
-\ s" hd:0 vmlinuz console= blah=" $boot
\ No newline at end of file
+\ s" hd:0 vmlinuz console= blah=" $boot

yaboot-1.3.13-bplan.patch:

Index: yaboot-1.3.13-bplan.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot-1.3.13-bplan.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-bplan.patch	27 Nov 2007 18:02:51 -0000	1.1
+++ yaboot-1.3.13-bplan.patch	28 Nov 2007 13:20:47 -0000	1.2
@@ -114,7 +114,13 @@
  	      !strncmp("chrp", model, 4))
  	       _machine = _MACH_chrp;
  	  else {
-@@ -1490,7 +1493,7 @@ yaboot_main(void)
+@@ -1486,11 +1489,13 @@ yaboot_main(void)
+ 	  prom_printf("%s: Unable to parse\n", bootdevice);
+ 	  return -1;
+      }
++     if (_machine == _MACH_bplan)
++	  boot.part++;
+      DEBUG_F("After parse_device_path: dev=%s, part=%d, file=%s\n",
  	     boot.dev, boot.part, boot.file);
  
       if (!conf_given) {


Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- yaboot.spec	27 Nov 2007 20:13:22 -0000	1.43
+++ yaboot.spec	28 Nov 2007 13:20:47 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -120,6 +120,10 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Wed Nov 28 2007 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-8
+- Correct default config file location on Efika
+- Disable new USB bindings in efika.forth for now
+
 * Tue Nov 27 2007 David Woodhouse <dwmw2 at redhat.com> - 1.3.13-7
 - Add efika.forth for fixing up Efika device-tree