From 21ae6cff90547127f0dc4af17b255723bddc246c4d1feebe6d108d6a2636edfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 7 Jun 2012 22:08:12 +0000 Subject: [PATCH] Accepting request 124131 from home:a_faerber:branches:Virtualization Update to final v1.1.0 OBS-URL: https://build.opensuse.org/request/show/124131 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=77 --- 0001-Handle-CPU-interrupts-by-inline-che.patch | 2 +- 0002-XXX-dont-dump-core-on-sigabort.patc.patch | 2 +- 0003-XXX-work-around-SA_RESTART-race-wit.patch | 2 +- 0004-qemu-0.9.0.cvs-binfmt.patch.patch | 2 +- 0005-qemu-cvs-alsa_bitfield.patch.patch | 2 +- 0006-qemu-cvs-alsa_ioctl.patch.patch | 2 +- 0007-qemu-cvs-alsa_mmap.patch.patch | 2 +- 0008-qemu-cvs-gettimeofday.patch.patch | 2 +- 0009-qemu-cvs-ioctl_debug.patch.patch | 2 +- 0010-qemu-cvs-ioctl_nodirection.patch.patch | 2 +- 0011-qemu-img-vmdk-scsi.patch.patch | 2 +- 0012-configure-Enable-mipsn32-linux-user.patch | 2 +- 0013-linux-user-add-binfmt-wrapper-for-a.patch | 2 +- 0014-linux-user-Ignore-timer_create-sysc.patch | 2 +- 0015-linux-user-be-silent-about-capget-f.patch | 2 +- 0016-PPC-KVM-Disable-mmu-notifier-check..patch | 2 +- 0017-linux-user-fix-segfault-deadlock.pa.patch | 2 +- 0018-linux-user-binfmt-support-host-bina.patch | 2 +- 0019-linux-user-ARM-Ignore-immediate-val.patch | 2 +- 0020-linux-user-arm-no-tb_flush-on-reset.patch | 2 +- 0021-linux-user-fix-multi-threaded-proc-.patch | 2 +- qemu-1.1.0-1.tar.bz2 | 3 +++ qemu-1.1.0-rc4.tar.bz2 | 3 --- qemu.changes | 6 ++++++ qemu.spec | 6 +++--- qemu.spec.in | 6 +++--- update_git.sh | 2 +- 27 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 qemu-1.1.0-1.tar.bz2 delete mode 100644 qemu-1.1.0-rc4.tar.bz2 diff --git a/0001-Handle-CPU-interrupts-by-inline-che.patch b/0001-Handle-CPU-interrupts-by-inline-che.patch index fdbdc0a8..93fff90a 100644 --- a/0001-Handle-CPU-interrupts-by-inline-che.patch +++ b/0001-Handle-CPU-interrupts-by-inline-che.patch @@ -1,4 +1,4 @@ -From b4ff079b57be6d450e4373500e1c042bc1c781b6 Mon Sep 17 00:00:00 2001 +From f83a3e6ff4aeb7ec2ff75afd64625e7915ef758a Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 5 Oct 2011 10:04:02 +0100 Subject: [PATCH] Handle CPU interrupts by inline checking of a flag diff --git a/0002-XXX-dont-dump-core-on-sigabort.patc.patch b/0002-XXX-dont-dump-core-on-sigabort.patc.patch index 6ccd378e..a1f05eda 100644 --- a/0002-XXX-dont-dump-core-on-sigabort.patc.patch +++ b/0002-XXX-dont-dump-core-on-sigabort.patc.patch @@ -1,4 +1,4 @@ -From ac5911aa43d91101e493aeab0d32de462e9fbf71 Mon Sep 17 00:00:00 2001 +From 86b1e6e983680b4332de69473e46103d22bfada4 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 21 Nov 2011 23:50:36 +0100 Subject: [PATCH] XXX dont dump core on sigabort diff --git a/0003-XXX-work-around-SA_RESTART-race-wit.patch b/0003-XXX-work-around-SA_RESTART-race-wit.patch index 6d9e38cc..217360f7 100644 --- a/0003-XXX-work-around-SA_RESTART-race-wit.patch +++ b/0003-XXX-work-around-SA_RESTART-race-wit.patch @@ -1,4 +1,4 @@ -From 473e1cb5e0edaedcbbde70b6db5b67efee755fec Mon Sep 17 00:00:00 2001 +From aabcf0dc3144e713aef746e32b66dc8d13b77891 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 1 Dec 2011 19:00:01 +0100 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) diff --git a/0004-qemu-0.9.0.cvs-binfmt.patch.patch b/0004-qemu-0.9.0.cvs-binfmt.patch.patch index 8be3cfe8..6b69796d 100644 --- a/0004-qemu-0.9.0.cvs-binfmt.patch.patch +++ b/0004-qemu-0.9.0.cvs-binfmt.patch.patch @@ -1,4 +1,4 @@ -From e810fadc66c4dee2781781cd152e6456b552ed3a Mon Sep 17 00:00:00 2001 +From 343ed56bc6ccd90974f43cca405e20919af04552 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:18:44 +0200 Subject: [PATCH] qemu-0.9.0.cvs-binfmt diff --git a/0005-qemu-cvs-alsa_bitfield.patch.patch b/0005-qemu-cvs-alsa_bitfield.patch.patch index 427f0488..ab90786e 100644 --- a/0005-qemu-cvs-alsa_bitfield.patch.patch +++ b/0005-qemu-cvs-alsa_bitfield.patch.patch @@ -1,4 +1,4 @@ -From bcf021390a99fa6cba78d6b8334174e909b414e3 Mon Sep 17 00:00:00 2001 +From e4b24a62433e546aa16a4e4f9018324086c264e7 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:20:50 +0200 Subject: [PATCH] qemu-cvs-alsa_bitfield diff --git a/0006-qemu-cvs-alsa_ioctl.patch.patch b/0006-qemu-cvs-alsa_ioctl.patch.patch index 4a8d8623..04319588 100644 --- a/0006-qemu-cvs-alsa_ioctl.patch.patch +++ b/0006-qemu-cvs-alsa_ioctl.patch.patch @@ -1,4 +1,4 @@ -From ca6e3990affefff3a2e1049a46ee43f36615d764 Mon Sep 17 00:00:00 2001 +From 137788d54993ea8543ed0b42be6a5b026e048b58 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:23:27 +0200 Subject: [PATCH] qemu-cvs-alsa_ioctl diff --git a/0007-qemu-cvs-alsa_mmap.patch.patch b/0007-qemu-cvs-alsa_mmap.patch.patch index 4fffbfe2..5e153e27 100644 --- a/0007-qemu-cvs-alsa_mmap.patch.patch +++ b/0007-qemu-cvs-alsa_mmap.patch.patch @@ -1,4 +1,4 @@ -From 0726fe25ef2c60855774b205a0558a04b16c110b Mon Sep 17 00:00:00 2001 +From 75a2031df4adb45576126c055bccee35c0384e64 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:24:15 +0200 Subject: [PATCH] qemu-cvs-alsa_mmap diff --git a/0008-qemu-cvs-gettimeofday.patch.patch b/0008-qemu-cvs-gettimeofday.patch.patch index c8eda2f6..36fc261f 100644 --- a/0008-qemu-cvs-gettimeofday.patch.patch +++ b/0008-qemu-cvs-gettimeofday.patch.patch @@ -1,4 +1,4 @@ -From 580cab745dcbaec7235f674f9fbabccdaebb8a3b Mon Sep 17 00:00:00 2001 +From c40b80d60882ca0a479de9dd14409fd3a2eba6bb Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday diff --git a/0009-qemu-cvs-ioctl_debug.patch.patch b/0009-qemu-cvs-ioctl_debug.patch.patch index bdbbf4ad..2213400f 100644 --- a/0009-qemu-cvs-ioctl_debug.patch.patch +++ b/0009-qemu-cvs-ioctl_debug.patch.patch @@ -1,4 +1,4 @@ -From 09922bf7854275573fbdbf6d464ad5636dc983fa Mon Sep 17 00:00:00 2001 +From 44449256ecf57af6468a63068d72c0e3f5253718 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:26:33 +0200 Subject: [PATCH] qemu-cvs-ioctl_debug diff --git a/0010-qemu-cvs-ioctl_nodirection.patch.patch b/0010-qemu-cvs-ioctl_nodirection.patch.patch index 22de5674..c44a7e92 100644 --- a/0010-qemu-cvs-ioctl_nodirection.patch.patch +++ b/0010-qemu-cvs-ioctl_nodirection.patch.patch @@ -1,4 +1,4 @@ -From db9cefd81e7978e63b09b41c5ce26bb96bf2491f Mon Sep 17 00:00:00 2001 +From 397d17731b3236cd11bd3c2191f94280c46eadef Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:27:36 +0200 Subject: [PATCH] qemu-cvs-ioctl_nodirection diff --git a/0011-qemu-img-vmdk-scsi.patch.patch b/0011-qemu-img-vmdk-scsi.patch.patch index 5bf7cf74..de468208 100644 --- a/0011-qemu-img-vmdk-scsi.patch.patch +++ b/0011-qemu-img-vmdk-scsi.patch.patch @@ -1,4 +1,4 @@ -From 93c98c433f5cf084032888d32dc13efcfc5227bd Mon Sep 17 00:00:00 2001 +From 24e926bb87d3199d3177358929eacb65af69418e Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:37:42 +0200 Subject: [PATCH] qemu-img-vmdk-scsi diff --git a/0012-configure-Enable-mipsn32-linux-user.patch b/0012-configure-Enable-mipsn32-linux-user.patch index 8a70ebc1..4994b036 100644 --- a/0012-configure-Enable-mipsn32-linux-user.patch +++ b/0012-configure-Enable-mipsn32-linux-user.patch @@ -1,4 +1,4 @@ -From bff8ce4f5827e994a74f376bf46d5a58e5821b71 Mon Sep 17 00:00:00 2001 +From 90f4c2f9a182626eea2d2ec962d89ada130c22f8 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Wed, 25 Aug 2010 14:23:43 +0200 Subject: [PATCH] configure: Enable mipsn32*-linux-user builds diff --git a/0013-linux-user-add-binfmt-wrapper-for-a.patch b/0013-linux-user-add-binfmt-wrapper-for-a.patch index bebcab43..118ed877 100644 --- a/0013-linux-user-add-binfmt-wrapper-for-a.patch +++ b/0013-linux-user-add-binfmt-wrapper-for-a.patch @@ -1,4 +1,4 @@ -From a795b137b7aa571d81c691392cf6a249a7b1c33f Mon Sep 17 00:00:00 2001 +From eaedb8d198e91c3a085df8704b513a3cb524d895 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 30 Sep 2011 19:40:36 +0200 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling diff --git a/0014-linux-user-Ignore-timer_create-sysc.patch b/0014-linux-user-Ignore-timer_create-sysc.patch index 19410d12..eb1d2f3e 100644 --- a/0014-linux-user-Ignore-timer_create-sysc.patch +++ b/0014-linux-user-Ignore-timer_create-sysc.patch @@ -1,4 +1,4 @@ -From 038680d6e3fe7fed37eaf7f6f0d669bd744e00cf Mon Sep 17 00:00:00 2001 +From 4312a512638d2d70144dce55a63f21dabcfda0cb Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:19:24 +0100 Subject: [PATCH] linux-user: Ignore timer_create syscall diff --git a/0015-linux-user-be-silent-about-capget-f.patch b/0015-linux-user-be-silent-about-capget-f.patch index bbcdb75e..3ccd487e 100644 --- a/0015-linux-user-be-silent-about-capget-f.patch +++ b/0015-linux-user-be-silent-about-capget-f.patch @@ -1,4 +1,4 @@ -From abfddfbe9105de3fa1c66d9f57fb7877ba81a7b0 Mon Sep 17 00:00:00 2001 +From 0b0a9d0508e5d4290afd272b9523c94761f11e9c Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:21:51 +0100 Subject: [PATCH] linux-user: be silent about capget failures diff --git a/0016-PPC-KVM-Disable-mmu-notifier-check..patch b/0016-PPC-KVM-Disable-mmu-notifier-check..patch index 3afdeeb8..9607acef 100644 --- a/0016-PPC-KVM-Disable-mmu-notifier-check..patch +++ b/0016-PPC-KVM-Disable-mmu-notifier-check..patch @@ -1,4 +1,4 @@ -From 53145c17ce102c6af036c7b8bd39223a4d2dcd30 Mon Sep 17 00:00:00 2001 +From e975674515cfe9e086341f3684452520908037d9 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 6 Jan 2012 01:05:55 +0100 Subject: [PATCH] PPC: KVM: Disable mmu notifier check diff --git a/0017-linux-user-fix-segfault-deadlock.pa.patch b/0017-linux-user-fix-segfault-deadlock.pa.patch index 15efae0e..8f4b69d2 100644 --- a/0017-linux-user-fix-segfault-deadlock.pa.patch +++ b/0017-linux-user-fix-segfault-deadlock.pa.patch @@ -1,4 +1,4 @@ -From 5f7a79a61617f28af048f9f15fd6afc708f96014 Mon Sep 17 00:00:00 2001 +From 203f51827bf2f7e34b13b0ad0b09789ec035aaa9 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 13 Jan 2012 17:05:41 +0100 Subject: [PATCH] linux-user: fix segfault deadlock diff --git a/0018-linux-user-binfmt-support-host-bina.patch b/0018-linux-user-binfmt-support-host-bina.patch index 94421e12..520ff6af 100644 --- a/0018-linux-user-binfmt-support-host-bina.patch +++ b/0018-linux-user-binfmt-support-host-bina.patch @@ -1,4 +1,4 @@ -From 509297d25e3f13ba048bffd5ec9fd0c1ee35d490 Mon Sep 17 00:00:00 2001 +From 4790cf690d3015adbe6a9e768d1009535c01ffeb Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 2 Feb 2012 18:02:33 +0100 Subject: [PATCH] linux-user: binfmt: support host binaries diff --git a/0019-linux-user-ARM-Ignore-immediate-val.patch b/0019-linux-user-ARM-Ignore-immediate-val.patch index fa0ce3e1..052a4b97 100644 --- a/0019-linux-user-ARM-Ignore-immediate-val.patch +++ b/0019-linux-user-ARM-Ignore-immediate-val.patch @@ -1,4 +1,4 @@ -From fe0e160212358a726be7ea98a99d889352489de6 Mon Sep 17 00:00:00 2001 +From 8cc5120497695e7ea8dde9b096eb6c8cb9b6ac35 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 29 May 2012 17:28:07 +0200 Subject: [PATCH] linux-user: ARM: Ignore immediate value for svc in thumb diff --git a/0020-linux-user-arm-no-tb_flush-on-reset.patch b/0020-linux-user-arm-no-tb_flush-on-reset.patch index e687eab3..dca23414 100644 --- a/0020-linux-user-arm-no-tb_flush-on-reset.patch +++ b/0020-linux-user-arm-no-tb_flush-on-reset.patch @@ -1,4 +1,4 @@ -From ff80c98ea2d617bfd88ac6c611b584eaf0240f3b Mon Sep 17 00:00:00 2001 +From ea18c65ff19aa12001556d7f19145f6eb2e8bcdc Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 29 May 2012 15:30:01 +0200 Subject: [PATCH] linux-user: arm: no tb_flush on reset diff --git a/0021-linux-user-fix-multi-threaded-proc-.patch b/0021-linux-user-fix-multi-threaded-proc-.patch index 6dd6fd70..2a63b1f2 100644 --- a/0021-linux-user-fix-multi-threaded-proc-.patch +++ b/0021-linux-user-fix-multi-threaded-proc-.patch @@ -1,4 +1,4 @@ -From 1cb769b4b1de47efe04fe50bb351a6367eb0a477 Mon Sep 17 00:00:00 2001 +From eb42dbe8f2c478276128622b3fe1125e4cd13759 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 30 May 2012 14:40:47 +0200 Subject: [PATCH] linux-user: fix multi-threaded /proc/self/maps diff --git a/qemu-1.1.0-1.tar.bz2 b/qemu-1.1.0-1.tar.bz2 new file mode 100644 index 00000000..eabc07e7 --- /dev/null +++ b/qemu-1.1.0-1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e566f8cbc33e5fb7d5f364c0fd1cdde9e921e647223b5d7ae7e5f95544b258d +size 9630116 diff --git a/qemu-1.1.0-rc4.tar.bz2 b/qemu-1.1.0-rc4.tar.bz2 deleted file mode 100644 index 7da8231c..00000000 --- a/qemu-1.1.0-rc4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a169284fd393853981d3060787671903737101f3f366e922e5a593328799f71d -size 9637922 diff --git a/qemu.changes b/qemu.changes index c845ff4a..5a79e246 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 5 13:25:43 UTC 2012 - afaerber@suse.de + +- Update to v1.1.0: see http://wiki.qemu.org/ChangeLog/1.1 +* Adapt update_git.sh script to new tag + ------------------------------------------------------------------- Fri Jun 1 13:22:09 UTC 2012 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 76439db8..d8568568 100644 --- a/qemu.spec +++ b/qemu.spec @@ -21,9 +21,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.1.0rc4 +Version: 1.1.0 Release: 0 -Source: %name-1.1.0-rc4.tar.bz2 +Source: %name-%version-1.tar.bz2 Patch0001: 0001-Handle-CPU-interrupts-by-inline-che.patch Patch0002: 0002-XXX-dont-dump-core-on-sigabort.patc.patch Patch0003: 0003-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 architectures builds %prep -%setup -q -n qemu-1.1.0-rc4 +%setup -q %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 diff --git a/qemu.spec.in b/qemu.spec.in index 5fb57539..e215a2f7 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -21,9 +21,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.1.0rc4 +Version: 1.1.0 Release: 0 -Source: %name-1.1.0-rc4.tar.bz2 +Source: %name-%version-1.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc @@ -94,7 +94,7 @@ emulations. This can be used together with the OBS build script to run cross architectures builds %prep -%setup -q -n qemu-1.1.0-rc4 +%setup -q PATCH_EXEC %build diff --git a/update_git.sh b/update_git.sh index b1840917..bbec407f 100644 --- a/update_git.sh +++ b/update_git.sh @@ -13,7 +13,7 @@ GIT_TREE=git://repo.or.cz/qemu/agraf.git GIT_LOCAL_TREE=/suse/agraf/git/qemu GIT_BRANCH=suse-1.1 -GIT_UPSTREAM_TAG=v1.1.0-rc4 +GIT_UPSTREAM_TAG=v1.1.0 QEMU_TMP=/dev/shm/qemu-tmp # clean up