rpms/qemu/devel qemu-fix-optionrom-install.patch, NONE, 1.1 qemu-bios-bigger-roms.patch, 1.8, 1.9 qemu-fix-linux-user-build-on-ppc.patch, 1.4, 1.5 qemu.spec, 1.114, 1.115 sources, 1.18, 1.19 qemu-fix-build-for-esd-audio.patch, 1.3, NONE qemu-prefer-sysfs-for-usb-host-devices.patch, 1.4, NONE qemu-slirp-Fix-guestfwd-for-incoming-data.patch, 1.3, NONE
Mark McLoughlin
markmc at fedoraproject.org
Thu Jul 30 16:28:52 UTC 2009
Author: markmc
Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9384
Modified Files:
qemu-bios-bigger-roms.patch
qemu-fix-linux-user-build-on-ppc.patch qemu.spec sources
Added Files:
qemu-fix-optionrom-install.patch
Removed Files:
qemu-fix-build-for-esd-audio.patch
qemu-prefer-sysfs-for-usb-host-devices.patch
qemu-slirp-Fix-guestfwd-for-incoming-data.patch
Log Message:
* Thu Jul 30 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.1.rc1.rc0
- Update to qemu-kvm-0.11.0-rc1-rc0
- This is a pre-release of the official -rc1
- A vista installer regression is blocking the official -rc1 release
- Drop qemu-prefer-sysfs-for-usb-host-devices.patch
- Drop qemu-fix-build-for-esd-audio.patch
- Drop qemu-slirp-Fix-guestfwd-for-incoming-data.patch
- Add patch to ensure extboot.bin is installed
qemu-fix-optionrom-install.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE qemu-fix-optionrom-install.patch ---
>From e941daafed39ae5db507af42da8a35b60a8be363 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 30 Jul 2009 17:17:43 +0100
Subject: [PATCH] Revert "Don't copy multiboot.bin into pc-bios after built"
This reverts commit 24d904eab3e806dc4d1ccdabbc3b4dcb64ddf497.
This ensures:
a) extboot.bin is copied to pc-bios and installed
b) the built mutliboot.bin overwrites the multiboot.bin
shipped in the tarball
Signed-of-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-optionrom-install.patch
---
pc-bios/optionrom/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 4cc3dae..e06ca72 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -41,6 +41,7 @@ build-all: multiboot.bin extboot.bin
%.bin: %.raw
$(SRC_PATH)/pc-bios/optionrom/signrom.sh $< $@
+ cp $@ $(SRC_PATH)/pc-bios/
clean:
$(RM) *.o *.img *.bin *~
--
1.6.2.5
qemu-bios-bigger-roms.patch:
rombios.c | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
Index: qemu-bios-bigger-roms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-bios-bigger-roms.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- qemu-bios-bigger-roms.patch 28 Jul 2009 08:17:19 -0000 1.8
+++ qemu-bios-bigger-roms.patch 30 Jul 2009 16:28:52 -0000 1.9
@@ -1,4 +1,4 @@
-From dd5a9dedba205ad51ef2fc70f0a1dddea7ff4a4f Mon Sep 17 00:00:00 2001
+From ad6bfcfe0292ac09aac0de729343dabf91c16f93 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Wed, 24 Jun 2009 14:31:41 +0100
Subject: [PATCH] compute checksum for roms bigger than a segment
@@ -23,10 +23,10 @@ Fedora-patch: qemu-bios-bigger-roms.patc
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/kvm/bios/rombios.c b/kvm/bios/rombios.c
-index 6186199..fc289c0 100644
+index 6e1d446..8a96d8e 100644
--- a/kvm/bios/rombios.c
+++ b/kvm/bios/rombios.c
-@@ -10170,22 +10170,43 @@ no_serial:
+@@ -10189,22 +10189,43 @@ no_serial:
ret
rom_checksum:
qemu-fix-linux-user-build-on-ppc.patch:
elf.h | 2 ++
linux-user/elfload.c | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
Index: qemu-fix-linux-user-build-on-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-linux-user-build-on-ppc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qemu-fix-linux-user-build-on-ppc.patch 28 Jul 2009 08:17:19 -0000 1.4
+++ qemu-fix-linux-user-build-on-ppc.patch 30 Jul 2009 16:28:52 -0000 1.5
@@ -1,4 +1,4 @@
-From 052506320166112bec0b5b7aa272973c1a508551 Mon Sep 17 00:00:00 2001
+From 6def4aea8b88f52de678ffca117ba70b1e6878c2 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 29 Jun 2009 14:49:03 +0100
Subject: [PATCH] Fix linux-user build on ppc
Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- qemu.spec 27 Jul 2009 02:18:00 -0000 1.114
+++ qemu.spec 30 Jul 2009 16:28:52 -0000 1.115
@@ -1,18 +1,18 @@
-%define kvmvernum 88
-%define kvmvertag kvm%{kvmvernum}
-%define kvmverfull kvm-devel-%{kvmvernum}
+%define kvmvertag rc1.rc0
+%define kvmverfull kvm-0.11.0-rc1-rc0
Summary: QEMU is a FAST! processor emulator
Name: qemu
-Version: 0.10.50
-Release: 14.%{kvmvertag}%{?dist}
+Version: 0.10.91
+Release: 0.1.%{kvmvertag}%{?dist}
# Epoch because we pushed a qemu-1.0 package
Epoch: 2
License: GPLv2+ and LGPLv2+ and BSD
Group: Development/Tools
URL: http://www.qemu.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
+Source0: http://markmc.fedorapeople.org/kvm/qemu-%{kvmverfull}.tar.gz
+#Source0: http://downloads.sourceforge.net/sourceforge/kvm/qemu-%{kvmverfull}.tar.gz
Source1: qemu.init
Source2: kvm.modules
Source3: 80-kvm.rules
@@ -23,14 +23,8 @@ Patch01: qemu-bios-bigger-roms.patch
# Works around broken linux-user build on ppc
Patch02: qemu-fix-linux-user-build-on-ppc.patch
-# Prefer sysfs over usbfs for usb passthrough (#508326)
-Patch03: qemu-prefer-sysfs-for-usb-host-devices.patch
-
-# Fix build with esound audio enabled, cherry-picked from upstream
-Patch04: qemu-fix-build-for-esd-audio.patch
-
-# Fix guestfwd behaviour, cherrypicked from upstream (#513249)
-Patch05: qemu-slirp-Fix-guestfwd-for-incoming-data.patch
+# Make sure multiboot.bin/extboot.bin gets installed
+Patch03: qemu-fix-optionrom-install.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -215,8 +209,6 @@ such as kvmtrace and kvm_stat.
%patch01 -p1
%patch02 -p1
%patch03 -p1
-%patch04 -p1
-%patch05 -p1
%build
# systems like rhel build system does not have a recent enough linker so
@@ -481,6 +473,15 @@ getent passwd qemu >/dev/null || \
%{_mandir}/man1/qemu-img.1*
%changelog
+* Thu Jul 30 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.91-0.1.rc1.rc0
+- Update to qemu-kvm-0.11.0-rc1-rc0
+- This is a pre-release of the official -rc1
+- A vista installer regression is blocking the official -rc1 release
+- Drop qemu-prefer-sysfs-for-usb-host-devices.patch
+- Drop qemu-fix-build-for-esd-audio.patch
+- Drop qemu-slirp-Fix-guestfwd-for-incoming-data.patch
+- Add patch to ensure extboot.bin is installed
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:0.10.50-14.kvm88
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 16 Jul 2009 11:15:53 -0000 1.18
+++ sources 30 Jul 2009 16:28:52 -0000 1.19
@@ -1 +1 @@
-0564b071fb1bb7211f51ef588ebb4a7c qemu-kvm-devel-88.tar.gz
+d5196f06c21f77c72977ef04c6cb0ae4 qemu-kvm-0.11.0-rc1-rc0.tar.gz
--- qemu-fix-build-for-esd-audio.patch DELETED ---
--- qemu-prefer-sysfs-for-usb-host-devices.patch DELETED ---
--- qemu-slirp-Fix-guestfwd-for-incoming-data.patch DELETED ---
More information about the fedora-extras-commits
mailing list