From 84d645109c53c60c740e93878760c924afc73528 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: May 21 2009 16:02:51 +0000 Subject: - Replace previous attempt to fix bug #494075 with fix from Pavel Roskin - Drop the 0.x.463 numbering; we are using official upstream 1.0 --- diff --git a/openbios-1.0-merge-sbss-into-bss.patch b/openbios-1.0-merge-sbss-into-bss.patch new file mode 100644 index 0000000..27e9ae9 --- /dev/null +++ b/openbios-1.0-merge-sbss-into-bss.patch @@ -0,0 +1,27 @@ +Put .sbss and .sbss.* into .bss on PowerPC + +From: Pavel Roskin + +This is needed on Fedora 11. Otherwise, qemu reports: + +invalid/unsupported opcode: 00 - 18 - 01 (00004070) 00000004 1 +invalid/unsupported opcode: 00 - 04 - 17 (000095c8) 000095ec 0 +--- + + arch/ppc/qemu/ldscript | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + + +diff --git a/arch/ppc/qemu/ldscript b/arch/ppc/qemu/ldscript +index 66fcbcd..840b498 100644 +--- a/arch/ppc/qemu/ldscript ++++ b/arch/ppc/qemu/ldscript +@@ -46,6 +46,8 @@ SECTIONS + + .bss ALIGN(4096): { + _bss = .; ++ *(.sbss) ++ *(.sbss.*) + *(.bss) + *(.bss.*) + *(COMMON) diff --git a/openbios-ppc-nographic.patch b/openbios-ppc-nographic.patch deleted file mode 100644 index 2447373..0000000 --- a/openbios-ppc-nographic.patch +++ /dev/null @@ -1,42 +0,0 @@ -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); diff --git a/openbios.spec b/openbios.spec index b90d389..4c3c09c 100644 --- a/openbios.spec +++ b/openbios.spec @@ -1,6 +1,6 @@ Name: openbios Version: 1.0 -Release: 0.6.svn463%{?dist} +Release: 1%{?dist} Summary: OpenBios implementation of IEEE 1275-1994 Group: Applications/Emulators License: GPLv2 @@ -10,7 +10,7 @@ URL: http://www.openfirmware.info/OpenBIOS # 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 +Patch1: openbios-1.0-merge-sbss-into-bss.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxslt @@ -92,8 +92,7 @@ BuildArch: noarch %setup -q %patch0 -p1 -# -p3, so we don't need to even touch upstream patch -%patch1 -p3 +%patch1 -p1 %build @@ -156,22 +155,26 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Apr 14 2009 Glauber Costa - 1.0.0.6 +* Thu May 21 2009 Mark McLoughlin - 1.0-1 +- Replace previous attempt to fix bug #494075 with fix from Pavel Roskin +- Drop the 0.x.463 numbering; we are using official upstream 1.0 + +* Tue Apr 14 2009 Glauber Costa - 1.0-0.6.463 - Applied bugfix for #494075 -* Wed Mar 04 2009 Glauber Costa - 1.0.0.5 +* Wed Mar 04 2009 Glauber Costa - 1.0-0.5.463 - created openbios-common instead of openbios-doc. It owns the directories and everybody depends on it. -* Wed Mar 04 2009 Glauber Costa - 1.0.0.4 +* Wed Mar 04 2009 Glauber Costa - 1.0-0.4.463 - Addressed comments on BZ 485420. rpmlint provides no error for me, added comentaries, and tell how to get the source. -* Tue Mar 03 2009 Glauber Costa - 1.0.0.3 +* Tue Mar 03 2009 Glauber Costa - 1.0-0.3.463 - Don't use prebuilt binaries anywhere. * Fri Feb 13 2009 Glauber Costa - 1.0.0.2 - Addressed comments on BZ 485420: clean build environment, own directories we create. -* Fri Feb 13 2009 Glauber Costa - 1.0.0.1 +* Fri Feb 13 2009 Glauber Costa - 1.0-0.1.463 - Created initial build for sparc32/sparc64