[seabios] Update to 0.6.2

Justin M. Forbes jforbes at fedoraproject.org
Wed Jul 13 16:19:35 UTC 2011


commit 35f47e682b9eac98874c1b5ad6efbc8cef64ad32
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Wed Jul 13 11:18:54 2011 -0500

    Update to 0.6.2

 .gitignore                                         |    1 +
 ...-to-using-0xf0000000-for-PCI-memory-start.patch |   40 ----------------
 0002-Fix-PkgLength-calculation-for-the-SSDT.patch  |   32 -------------
 seabios-0.6.2-build.patch                          |   49 ++++++++++++++++++++
 seabios.spec                                       |   11 ++++-
 sources                                            |    2 +-
 6 files changed, 60 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 384e585..f412bfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 seabios-0.5.1.tar.gz
 seabios-0.6.0.tar.gz
+/seabios-0.6.2.tar.gz
diff --git a/seabios-0.6.2-build.patch b/seabios-0.6.2-build.patch
new file mode 100644
index 0000000..3d9fb51
--- /dev/null
+++ b/seabios-0.6.2-build.patch
@@ -0,0 +1,49 @@
+diff -ruNp seabios-0.6.2.orig/Makefile seabios-0.6.2/Makefile
+--- seabios-0.6.2.orig/Makefile	2011-07-13 10:52:50.000000000 -0500
++++ seabios-0.6.2/Makefile	2011-07-13 11:14:14.000000000 -0500
+@@ -5,7 +5,7 @@
+ # This file may be distributed under the terms of the GNU LGPLv3 license.
+ 
+ # Program version
+-VERSION=0.6.2-$(shell date +"%Y%m%d_%H%M%S")-$(shell hostname)
++VERSION=0.6.2
+ 
+ # Output directory
+ OUT=out/
+diff -ruNp seabios-0.6.2.orig/src/ahci.c seabios-0.6.2/src/ahci.c
+--- seabios-0.6.2.orig/src/ahci.c	2011-07-13 10:52:50.000000000 -0500
++++ seabios-0.6.2/src/ahci.c	2011-07-13 11:14:14.000000000 -0500
+@@ -408,7 +408,6 @@ static void
+ ahci_detect(void *data)
+ {
+     struct ahci_ctrl_s *ctrl = data;
+-    struct ahci_port_s *port;
+     u32 pnr, max;
+     int rc;
+ 
+@@ -422,7 +421,7 @@ ahci_detect(void *data)
+         dprintf(1, "AHCI/%d: link %s\n", pnr, rc == 0 ? "up" : "down");
+         if (rc != 0)
+             continue;
+-        port = ahci_port_init(ctrl, pnr);
++        ahci_port_init(ctrl, pnr);
+     }
+ }
+ 
+diff -ruNp seabios-0.6.2.orig/src/bregs.h seabios-0.6.2/src/bregs.h
+--- seabios-0.6.2.orig/src/bregs.h	2011-07-13 10:52:50.000000000 -0500
++++ seabios-0.6.2/src/bregs.h	2011-07-13 11:16:04.000000000 -0500
+@@ -37,9 +37,9 @@
+ struct bregs {
+     u16 ds;
+     u16 es;
+-    UREG(edi, di, di_hi, di_lo);
+-    UREG(esi, si, si_hi, si_lo);
+-    UREG(ebp, bp, bp_hi, bp_lo);
++    UREG(edi, di, di8u, di8l);
++    UREG(esi, si, si8u, si8l);
++    UREG(ebp, bp, bp8u, bp8l);
+     UREG(ebx, bx, bh, bl);
+     UREG(edx, dx, dh, dl);
+     UREG(ecx, cx, ch, cl);
+Binary files seabios-0.6.2.orig/tools/layoutrom.pyc and seabios-0.6.2/tools/layoutrom.pyc differ
diff --git a/seabios.spec b/seabios.spec
index 72ae825..d01b63c 100644
--- a/seabios.spec
+++ b/seabios.spec
@@ -1,5 +1,5 @@
 Name:           seabios
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Open-source legacy BIOS implementation
 
@@ -8,6 +8,8 @@ License:        LGPLv3
 URL:            http://www.coreboot.org/SeaBIOS
 Source0:        http://www.linuxtogo.org/~kevin/SeaBIOS/%{name}-%{version}.tar.gz
 
+Patch0: seabios-0.6.2-build.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
@@ -38,6 +40,8 @@ that a typical x86 proprietary BIOS implements.
 %prep
 %setup -q
 
+%patch00 -p1
+
 # Makefile changes version to include date and buildhost
 sed -i 's,VERSION=%{version}.*,VERSION=%{version},g' Makefile
 
@@ -45,7 +49,7 @@ sed -i 's,VERSION=%{version}.*,VERSION=%{version},g' Makefile
 %build
 %ifarch %{ix86} x86_64 
 export CFLAGS="$RPM_OPT_FLAGS"
-make
+make 
 %endif
 
 
@@ -74,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 13 2011 Justin M. forbes <jforbes at redhat.com> - 0.6.2-1
+- Update to 0.6.2 upstream for a number of bugfixes
+
 * Mon Feb 14 2011 Justin M. forbes <jforbes at redhat.com> - 0.6.1-1
 - Update to 0.6.1 upstream for a number of bugfixes
 
diff --git a/sources b/sources
index 084f0be..feab5a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ac454af8bbe4b4931dd1fd4505e5833  seabios-0.6.1.tar.gz
+ec58d93b93fa29550164693f714c9320  seabios-0.6.2.tar.gz


More information about the scm-commits mailing list