SHA256
1
0
forked from pool/qemu

Accepting request 322133 from home:a_faerber:branches:Virtualization

Update to v2.4.0-rc2

OBS-URL: https://build.opensuse.org/request/show/322133
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=270
This commit is contained in:
Andreas Färber 2015-08-12 16:17:59 +00:00 committed by Git OBS Bridge
parent b09a6e6d65
commit adbf7c9bf6
53 changed files with 101 additions and 67 deletions

View File

@ -1,4 +1,4 @@
From 0b60cee04561c1dcc7c442622445d08243be93fd Mon Sep 17 00:00:00 2001
From cf6d5245570b5d60824008d0c98649e97568c1c7 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 21 Nov 2011 23:50:36 +0100
Subject: [PATCH] XXX dont dump core on sigabort

View File

@ -1,4 +1,4 @@
From e2cc1c3c620eb2f4f6f81a43c7b3635e0495d4c5 Mon Sep 17 00:00:00 2001
From 781ea709edb276d4d3a4352d984857719fac8a39 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 1 Dec 2011 19:00:01 +0100
Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)

View File

@ -1,4 +1,4 @@
From 0c6f5965d31d72e0fb16d918694aaca8643b62e9 Mon Sep 17 00:00:00 2001
From fc804b17315876665d1a6008115536aa2ee63e21 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:18:44 +0200
Subject: [PATCH] qemu-0.9.0.cvs-binfmt

View File

@ -1,4 +1,4 @@
From 3e6f37000225aba907179585e92b3296690be8fa Mon Sep 17 00:00:00 2001
From 3a7dfd3f40d92092597e8f7c4f32887fa032a317 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:20:50 +0200
Subject: [PATCH] qemu-cvs-alsa_bitfield

View File

@ -1,4 +1,4 @@
From a665925912e3807c5a371c582803e77e08b4ad30 Mon Sep 17 00:00:00 2001
From 64ff982be8d707a2cd105e42f4c434826451f042 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:23:27 +0200
Subject: [PATCH] qemu-cvs-alsa_ioctl

View File

@ -1,4 +1,4 @@
From d4d9043f71fa15ae5f31119148dc6fb5bfd2ef5d Mon Sep 17 00:00:00 2001
From 00e65df825c9850d7adb3ecb4d41a971ccf18077 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:24:15 +0200
Subject: [PATCH] qemu-cvs-alsa_mmap

View File

@ -1,4 +1,4 @@
From a7d1ccc627e6ffd822ae1e8dbff80bb5bf224224 Mon Sep 17 00:00:00 2001
From 44f94bad0bf9f7fcfa91818549f6af2d93080d0a Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:25:41 +0200
Subject: [PATCH] qemu-cvs-gettimeofday

View File

@ -1,4 +1,4 @@
From 4ad9fd908a820c9bac7eec48e6d15f227b9d66a6 Mon Sep 17 00:00:00 2001
From 7888404be1ed347d3d9ae29f1cfa83217c2928bd Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:26:33 +0200
Subject: [PATCH] qemu-cvs-ioctl_debug

View File

@ -1,4 +1,4 @@
From c088edae2329601716bf517c8703cfa15654b4ff Mon Sep 17 00:00:00 2001
From ce2f2aa9f9785c06d69f78ebc6d33c298bad7318 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:27:36 +0200
Subject: [PATCH] qemu-cvs-ioctl_nodirection

View File

@ -1,4 +1,4 @@
From 192ab5152fe3d737eb5b3faa14c628b609467dbc Mon Sep 17 00:00:00 2001
From 676193f701940aafa973deeb4d387e0e899f97ba Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:37:42 +0200
Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img

View File

@ -1,4 +1,4 @@
From aa980fb23aaedc9ead7ef5c2638ba0fea17d3610 Mon Sep 17 00:00:00 2001
From bb54233290f2173961f43bbee59277dda84ec920 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling

View File

@ -1,4 +1,4 @@
From ce85fde5c40ca4bf0d993618358a0ae2536c0ab7 Mon Sep 17 00:00:00 2001
From 47d5cd1142c71d392aa528e87719539aa4b8a212 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 6 Jan 2012 01:05:55 +0100
Subject: [PATCH] PPC: KVM: Disable mmu notifier check

View File

@ -1,4 +1,4 @@
From 68431df3d7b9a869979f10c7349f9199f6c75bbd Mon Sep 17 00:00:00 2001
From 6aa7444acd8cf15aa164040e5af778e890a94fc9 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 13 Jan 2012 17:05:41 +0100
Subject: [PATCH] linux-user: fix segfault deadlock

View File

@ -1,4 +1,4 @@
From f798bcb59e1e4c18a207a6a073f532682631fd78 Mon Sep 17 00:00:00 2001
From 39928000f08c6f72424d0da57b33c66e5387003c Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 2 Feb 2012 18:02:33 +0100
Subject: [PATCH] linux-user: binfmt: support host binaries

View File

@ -1,4 +1,4 @@
From af5a1b3e3506d28f651ed69ab69d878fea8ad112 Mon Sep 17 00:00:00 2001
From 76d020651c11c05848299b460b246273a69f7275 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 12 Jun 2012 04:41:10 +0200
Subject: [PATCH] linux-user: Ignore broken loop ioctl

View File

@ -1,4 +1,4 @@
From db3ace8acc1f385b04fc38d4c454946b6aad9c3b Mon Sep 17 00:00:00 2001
From ecc5b618ee6deebe09d2ced341e34018fdad90db Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 5 Jul 2012 17:31:39 +0200
Subject: [PATCH] linux-user: lock tcg

View File

@ -1,4 +1,4 @@
From 7a9da3339463b0323685b4cb2b9d84700e1d6bd1 Mon Sep 17 00:00:00 2001
From ef1239bb2792265ebf0b54a10e80c2196a1a8eca Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 10 Jul 2012 20:40:55 +0200
Subject: [PATCH] linux-user: Run multi-threaded code on a single core

View File

@ -1,4 +1,4 @@
From e26974aa6d52eed27b4129ba881535bdcf6be9b3 Mon Sep 17 00:00:00 2001
From e1e0da726d1ac207518481109f2a62443caff430 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 11 Jul 2012 16:47:42 +0200
Subject: [PATCH] linux-user: lock tb flushing too

View File

@ -1,4 +1,4 @@
From 3bb9f549544a34a892fc180f7be0c1b3cdc398f0 Mon Sep 17 00:00:00 2001
From 787779e7cd38d4cb3787db99f5f589c1becde4c7 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 23 Jul 2012 10:24:14 +0200
Subject: [PATCH] linux-user: Fake /proc/cpuinfo

View File

@ -1,4 +1,4 @@
From 980f4989e1c2d4c3c9ff7098619080bc36c2a789 Mon Sep 17 00:00:00 2001
From 9e701636e5647576de6d23850b1d7efa336c948f Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 20 Aug 2012 00:02:52 +0200
Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl

View File

@ -1,4 +1,4 @@
From 3802af307fafff4cd23c6df4795871d016bac824 Mon Sep 17 00:00:00 2001
From 7bb60fca5ba001b00dacc4f79840f4214434e4d7 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 20 Aug 2012 00:07:13 +0200
Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl

View File

@ -1,4 +1,4 @@
From 9f962bf00aef27876ca88af82f5a5ed941e6955b Mon Sep 17 00:00:00 2001
From 7b8d7c6b185bcab62ceeeb45ba7aefa9437c99cc Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 21 Aug 2012 14:20:40 +0200
Subject: [PATCH] linux-user: XXX disable fiemap

View File

@ -1,4 +1,4 @@
From 86cf67e43c44ec7ec1203e3728e6af53569aab48 Mon Sep 17 00:00:00 2001
From d15b314ffa1cc0f09605a372e879957b3709f0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Wed, 29 Aug 2012 18:42:56 +0200
Subject: [PATCH] slirp: -nooutgoing
@ -12,10 +12,10 @@ TBD (from SUSE Studio team)
4 files changed, 40 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index 7b8efbf..dcf11b1 100644
index 8c9add9..3e208a1 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2916,6 +2916,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
@@ -2915,6 +2915,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
from a script.
ETEXI

View File

@ -1,4 +1,4 @@
From 355664b3485e6a10fbc3ee8d69cabcb234264396 Mon Sep 17 00:00:00 2001
From a72d0ea65e8771778fec75b154e7b2fed69cf3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Wed, 29 Aug 2012 20:06:01 +0200
Subject: [PATCH] vnc: password-file= and incoming-connections=

View File

@ -1,4 +1,4 @@
From 4cc8ddc870c59ef1a92ee725acac5c729c75a879 Mon Sep 17 00:00:00 2001
From f542d111b0ed23cec2e066821e49d28b3f961ad5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 10 Oct 2012 10:21:20 +0200
Subject: [PATCH] linux-user: add more blk ioctls

View File

@ -1,4 +1,4 @@
From 643279243c15a51070b00dc994306085a97b8eb3 Mon Sep 17 00:00:00 2001
From e482b906241c74cf3bcd3355e01ffb8f58a02067 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 9 Oct 2012 09:06:49 +0200
Subject: [PATCH] linux-user: use target_ulong

View File

@ -1,4 +1,4 @@
From 6b1bb5b347b1378d5d4d465cf75f32da2618de7a Mon Sep 17 00:00:00 2001
From bc287f6086a7e92abc9eabc325b0e7f6f0342a63 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 5 Aug 2009 09:49:37 +0200
Subject: [PATCH] block: Add support for DictZip enabled gzip files

View File

@ -1,4 +1,4 @@
From ffe16e68597abf4426db0c69c29d9307d528dd58 Mon Sep 17 00:00:00 2001
From 67d7241fd849d4e0f0fefe571507720bd62a7285 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 5 Aug 2009 17:28:38 +0200
Subject: [PATCH] block: Add tar container format

View File

@ -1,4 +1,4 @@
From 52b2f52b9719a840f23723be9377a2cee8bbcc9e Mon Sep 17 00:00:00 2001
From cb1f9bea31e1c6b6bbe40d75a13a29e39890ac31 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 12 Dec 2012 19:11:30 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch

View File

@ -1,4 +1,4 @@
From d0c904c9e8618bbf2cf6c8ea789c3f3788f90913 Mon Sep 17 00:00:00 2001
From f12eb4650069436337bb35f8b13cf417e84066f5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 6 Jun 2011 06:53:52 +0200
Subject: [PATCH] console: add question-mark escape operator

View File

@ -1,4 +1,4 @@
From 4f4a18839bbd539da47de905b1cd2fc2e9005a56 Mon Sep 17 00:00:00 2001
From 0d4854d1247eaf9f4724bf90fecafcf7322cca18 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 1 Apr 2010 17:36:23 +0200
Subject: [PATCH] Make char muxer more robust wrt small FIFOs

View File

@ -1,4 +1,4 @@
From 8113753d49024ddbdc08960f321c618f4b013d88 Mon Sep 17 00:00:00 2001
From 3e6c50be545907807fc1294c26d65011f51386f5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 13 Dec 2012 14:29:22 +0100
Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed

View File

@ -1,4 +1,4 @@
From 913f2b4eadc478f972fd539c866f87a5d9eca380 Mon Sep 17 00:00:00 2001
From fc0c23aa1dbcc6c0a0146a2679626bbf1e90e2b3 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Thu, 16 May 2013 12:39:10 +0200
Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken

View File

@ -1,4 +1,4 @@
From 59f74d76bbe712e8f283bd4b940db36e117b7661 Mon Sep 17 00:00:00 2001
From ad613ef4235da1d8fb565d74e3a46b2d155f6552 Mon Sep 17 00:00:00 2001
From: Dinar Valeev <k0da@opensuse.org>
Date: Wed, 2 Oct 2013 17:56:03 +0200
Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts

View File

@ -1,4 +1,4 @@
From c33743b4d896a9f3eba74b55d683304d1e152165 Mon Sep 17 00:00:00 2001
From 76b55ce3358039c8b6644b2d9312a4694479aec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Thu, 17 Apr 2014 18:39:10 +0200
Subject: [PATCH] qtest: Increase socket timeout

View File

@ -1,4 +1,4 @@
From f55020d6731290ff36d8e1d868141bd8534edb3c Mon Sep 17 00:00:00 2001
From 4967ebd0cc3c33ae6a88a90ea4702b17d3bd1050 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 14 Jan 2015 01:32:11 +0100
Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts

View File

@ -1,4 +1,4 @@
From 52738295076f499e97443ac9f5e45dcced885e4b Mon Sep 17 00:00:00 2001
From ac83b8b2c72cbe56fcafef046d83e3d074cdd88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Tue, 14 Apr 2015 18:42:06 +0200
Subject: [PATCH] Revert "Revert seccomp tests that allow it to be used on

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
- Update to v2.4.0-rc2: See http://wiki.qemu-project.org/ChangeLog/2.4
-------------------------------------------------------------------
Fri Jul 17 13:36:52 UTC 2015 - afaerber@suse.de

View File

@ -21,9 +21,9 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 2.3.91
Version: 2.3.92
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
@ -120,7 +120,7 @@ the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%prep
%setup -q -n qemu-2.4.0-rc1
%setup -q -n qemu-2.4.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1

View File

@ -23,7 +23,7 @@ License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
@ -84,7 +84,7 @@ the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%prep
%setup -q -n qemu-2.4.0-rc1
%setup -q -n qemu-2.4.0-rc2
PATCH_EXEC
%build

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0c6072ed9196ee17b4120f03fa9cdf9f63e893f7cb8008aa12ea1678450a481
size 25052566

Binary file not shown.

3
qemu-2.4.0-rc2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad86df38f10ad8b5fc03a7ec32b0080c0a5ab9e01fdaa7d5ba26f8591dd9b2fe
size 25053664

BIN
qemu-2.4.0-rc2.tar.bz2.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
- Update to v2.4.0-rc2: See http://wiki.qemu-project.org/ChangeLog/2.4
-------------------------------------------------------------------
Fri Jul 17 13:36:49 UTC 2015 - afaerber@suse.de

View File

@ -21,9 +21,9 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 2.3.91
Version: 2.3.92
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
@ -114,7 +114,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n qemu-2.4.0-rc1
%setup -q -n qemu-2.4.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1

View File

@ -23,7 +23,7 @@ License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
# Please do not add patches manually here, run update_git.sh.
@ -78,7 +78,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n qemu-2.4.0-rc1
%setup -q -n qemu-2.4.0-rc2
PATCH_EXEC
%build

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
- Update to v2.4.0-rc2: See http://wiki.qemu-project.org/ChangeLog/2.4
* Provide qemu-img symlink instead of passing QTEST_QEMU_IMG
-------------------------------------------------------------------
Fri Jul 17 13:36:45 UTC 2015 - afaerber@suse.de

View File

@ -43,10 +43,10 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 2.3.91
Version: 2.3.92
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2.sig
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -254,6 +254,7 @@ Recommends: qemu-arm
%else
Suggests: qemu-arm
%endif
Suggests: qemu-block-dmg
Suggests: qemu-extra
Suggests: qemu-lang
%if 0%{?suse_version} >= 1210
@ -569,7 +570,7 @@ This package provides a service file for starting and stopping KSM.
%endif # !qemu-testsuite
%prep
%setup -q -n qemu-2.4.0-rc1
%setup -q -n qemu-2.4.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -769,15 +770,18 @@ cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
%endif
%else # qemu-testsuite
ln -s %{_bindir}/qemu-img qemu-img
for conf in default-configs/*-softmmu.mak; do
arch=`echo "$conf" | sed -e 's|default-configs/\(.*\)-softmmu.mak|\1|g'`
ln -s %{_bindir}/qemu-system-$arch $arch-softmmu/qemu-system-$arch
done
%endif
%check
%if "%{name}" == "qemu-testsuite"
export QTEST_QEMU_IMG=%{_bindir}/qemu-img
%if 0%{?suse_version} >= 1310
make check-report.html V=1
install -D -m 644 check-report.html %{buildroot}%{_datadir}/qemu/check-report.html

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 24 15:19:06 UTC 2015 - afaerber@suse.de
- Update to v2.4.0-rc2: See http://wiki.qemu-project.org/ChangeLog/2.4
* Provide qemu-img symlink instead of passing QTEST_QEMU_IMG
-------------------------------------------------------------------
Fri Jul 17 13:36:45 UTC 2015 - afaerber@suse.de

View File

@ -43,10 +43,10 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 2.3.91
Version: 2.3.92
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2.sig
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -254,6 +254,7 @@ Recommends: qemu-arm
%else
Suggests: qemu-arm
%endif
Suggests: qemu-block-dmg
Suggests: qemu-extra
Suggests: qemu-lang
%if 0%{?suse_version} >= 1210
@ -569,7 +570,7 @@ This package provides a service file for starting and stopping KSM.
%endif # !qemu-testsuite
%prep
%setup -q -n qemu-2.4.0-rc1
%setup -q -n qemu-2.4.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -769,15 +770,18 @@ cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
%endif
%else # qemu-testsuite
ln -s %{_bindir}/qemu-img qemu-img
for conf in default-configs/*-softmmu.mak; do
arch=`echo "$conf" | sed -e 's|default-configs/\(.*\)-softmmu.mak|\1|g'`
ln -s %{_bindir}/qemu-system-$arch $arch-softmmu/qemu-system-$arch
done
%endif
%check
%if "%{name}" == "qemu-testsuite"
export QTEST_QEMU_IMG=%{_bindir}/qemu-img
%if 0%{?suse_version} >= 1310
make check-report.html V=1
install -D -m 644 check-report.html %{buildroot}%{_datadir}/qemu/check-report.html

View File

@ -45,8 +45,8 @@ License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc1.tar.bz2.sig
Source: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2
Source99: http://wiki.qemu.org/download/qemu-2.4.0-rc2.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -218,6 +218,7 @@ Recommends: qemu-arm
%else
Suggests: qemu-arm
%endif
Suggests: qemu-block-dmg
Suggests: qemu-extra
Suggests: qemu-lang
%if 0%{?suse_version} >= 1210
@ -533,7 +534,7 @@ This package provides a service file for starting and stopping KSM.
%endif # !qemu-testsuite
%prep
%setup -q -n qemu-2.4.0-rc1
%setup -q -n qemu-2.4.0-rc2
PATCH_EXEC
%if %{build_x86_fw_from_source}
@ -697,15 +698,18 @@ cp pc-bios/s390-ccw/s390-ccw.img pc-bios/s390-ccw.img
%endif
%else # qemu-testsuite
ln -s %{_bindir}/qemu-img qemu-img
for conf in default-configs/*-softmmu.mak; do
arch=`echo "$conf" | sed -e 's|default-configs/\(.*\)-softmmu.mak|\1|g'`
ln -s %{_bindir}/qemu-system-$arch $arch-softmmu/qemu-system-$arch
done
%endif
%check
%if "%{name}" == "qemu-testsuite"
export QTEST_QEMU_IMG=%{_bindir}/qemu-img
%if 0%{?suse_version} >= 1310
make check-report.html V=1
install -D -m 644 check-report.html %{buildroot}%{_datadir}/qemu/check-report.html

View File

@ -12,7 +12,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
GIT_BRANCH=opensuse-2.4
GIT_UPSTREAM_TAG=v2.4.0-rc1
GIT_UPSTREAM_TAG=v2.4.0-rc2
GIT_DIR=/dev/shm/qemu-factory-git-dir
CMP_DIR=/dev/shm/qemu-factory-cmp-dir