rpms/openbios/devel openbios-ppc-nographic.patch, NONE, 1.1 openbios.spec, 1.2, 1.3

[Glauber Costa]

Author: glommer

Update of /cvs/pkgs/rpms/openbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17223

Modified Files:
	openbios.spec 
Added Files:
	openbios-ppc-nographic.patch 
Log Message:
applied bugfix for 494075



openbios-ppc-nographic.patch:

--- NEW FILE openbios-ppc-nographic.patch ---
Index: /trunk/openbios-devel/drivers/pci.c
===================================================================
--- /trunk/openbios-devel/drivers/pci.c (revision 449)
+++ /trunk/openbios-devel/drivers/pci.c (revision 481)
@@ -37,5 +37,6 @@
 /* DECLARE data structures for the nodes.  */
 
-DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) );
+DECLARE_UNNAMED_NODE( ob_pci_bus_node, INSTALL_OPEN, 2*sizeof(int) );
+DECLARE_UNNAMED_NODE( ob_pci_simple_node, INSTALL_OPEN, 2*sizeof(int) );
 
 const pci_arch_t *arch;
@@ -157,5 +158,5 @@
 }
 
-NODE_METHODS(ob_pci_node) = {
+NODE_METHODS(ob_pci_bus_node) = {
 	{ NULL,			ob_pci_initialize	},
 	{ "open",		ob_pci_open		},
@@ -163,4 +164,10 @@
 	{ "decode-unit",	ob_pci_decode_unit	},
 	{ "encode-unit",	ob_pci_encode_unit	},
+};
+
+NODE_METHODS(ob_pci_simple_node) = {
+	{ NULL,			ob_pci_initialize	},
+	{ "open",		ob_pci_open		},
+	{ "close",		ob_pci_close		},
 };
 
@@ -738,5 +745,10 @@
 			config.dev = addr & 0x00FFFFFF;
 
-			REGISTER_NAMED_NODE(ob_pci_node, config.path);
+                        if (class == PCI_BASE_CLASS_BRIDGE &&
+                            (subclass == PCI_SUBCLASS_BRIDGE_HOST ||
+                             subclass == PCI_SUBCLASS_BRIDGE_PCI))
+                            REGISTER_NAMED_NODE(ob_pci_bus_node, config.path);
+                        else
+                            REGISTER_NAMED_NODE(ob_pci_simple_node, config.path);
 
 			activate_device(config.path);


Index: openbios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbios/devel/openbios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openbios.spec	9 Apr 2009 15:54:50 -0000	1.2
+++ openbios.spec	14 Apr 2009 17:24:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		openbios
 Version:	1.0
-Release:	0.5.svn463%{?dist}
+Release:	0.6.svn463%{?dist}
 Summary:	OpenBios implementation of IEEE 1275-1994
 Group:		Applications/Emulators
 License:	GPLv2
@@ -10,6 +10,7 @@
 # tar czvf openbios-1.0.tar.gz openbios-1.0
 Source0:	%{name}/%{name}-%{version}.tar.gz
 Patch0:		openbios-noerror.patch
+Patch1:		openbios-ppc-nographic.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxslt
 
@@ -91,6 +92,8 @@
 
 %setup -q
 %patch0 -p1
+# -p3, so we don't need to even touch upstream patch
+%patch1 -p3
 
 %build
 
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.6
+- Applied bugfix for #494075
+
 * Wed Mar 04 2009 Glauber Costa <glommer at redhat.com> - 1.0.0.5
 - created openbios-common instead of openbios-doc. It owns the directories
   and everybody depends on it.