Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2012-06-10 20:33:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2012-05-25 16:19:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2012-06-10 21:53:04.000000000 +0200 @@ -1,0 +2,33 @@ +Tue Jun 5 13:25:43 UTC 2012 - [email protected] + +- 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 - [email protected] + +- Update to v1.1.0-rc4: see http://wiki.qemu.org/ChangeLog/1.1 +* Adapt update_git.sh script to new tag + +------------------------------------------------------------------- +Thu May 31 17:37:26 UTC 2012 - [email protected] + +- fix /proc/self/maps faking with secondary threads + +------------------------------------------------------------------- +Wed May 30 20:19:05 CEST 2012 - [email protected] + +- revert commit a84fac1426 to fix automoc4 for arm + +------------------------------------------------------------------- +Tue May 29 15:52:47 UTC 2012 - [email protected] + +- remove manual interp prefix, which made all linux-user binaries + point to an i386 LD_PREFIX path + +------------------------------------------------------------------- +Tue May 29 15:34:55 UTC 2012 - [email protected] + +- add patch to fix building of go (swi in thumb ignores imm) + +------------------------------------------------------------------- Old: ---- qemu-1.1.0-rc3.tar.bz2 New: ---- 0019-linux-user-ARM-Ignore-immediate-val.patch 0020-linux-user-arm-no-tb_flush-on-reset.patch 0021-linux-user-fix-multi-threaded-proc-.patch qemu-1.1.0-1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -21,9 +21,9 @@ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.1.0rc3 +Version: 1.1.0 Release: 0 -Source: %name-1.1.0-rc3.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 @@ -42,6 +42,9 @@ Patch0016: 0016-PPC-KVM-Disable-mmu-notifier-check..patch Patch0017: 0017-linux-user-fix-segfault-deadlock.pa.patch Patch0018: 0018-linux-user-binfmt-support-host-bina.patch +Patch0019: 0019-linux-user-ARM-Ignore-immediate-val.patch +Patch0020: 0020-linux-user-arm-no-tb_flush-on-reset.patch +Patch0021: 0021-linux-user-fix-multi-threaded-proc-.patch # this is to make lint happy Source300: rpmlintrc Source400: update_git.sh @@ -111,7 +114,7 @@ run cross architectures builds %prep -%setup -q -n qemu-1.1.0-rc3 +%setup -q %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -130,13 +133,15 @@ %patch0016 -p1 %patch0017 -p1 %patch0018 -p1 +%patch0019 -p1 +%patch0020 -p1 +%patch0021 -p1 %build # build QEMU mkdir -p dynamic # build qemu-system ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ --enable-curl \ @@ -156,7 +161,6 @@ make clean # build userland emus ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ --enable-linux-user \ --disable-system \ --static --disable-linux-aio \ ++++++ 0001-Handle-CPU-interrupts-by-inline-che.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From aa21387b7e43d3aca4a3111502eff7d50e6f5944 Mon Sep 17 00:00:00 2001 +From f83a3e6ff4aeb7ec2ff75afd64625e7915ef758a Mon Sep 17 00:00:00 2001 From: Peter Maydell <[email protected]> Date: Wed, 5 Oct 2011 10:04:02 +0100 Subject: [PATCH] Handle CPU interrupts by inline checking of a flag ++++++ 0002-XXX-dont-dump-core-on-sigabort.patc.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 57a19d136179d433b20ca977c5db54156a4959a3 Mon Sep 17 00:00:00 2001 +From 86b1e6e983680b4332de69473e46103d22bfada4 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Mon, 21 Nov 2011 23:50:36 +0100 Subject: [PATCH] XXX dont dump core on sigabort ++++++ 0003-XXX-work-around-SA_RESTART-race-wit.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From ecdca756dc912d0fb26c28bff701cc2b2b4402d6 Mon Sep 17 00:00:00 2001 +From aabcf0dc3144e713aef746e32b66dc8d13b77891 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 1 Dec 2011 19:00:01 +0100 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) ++++++ 0004-qemu-0.9.0.cvs-binfmt.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 81905e73a67bfd1427c17a7047d6ab89a51fe3e2 Mon Sep 17 00:00:00 2001 +From 343ed56bc6ccd90974f43cca405e20919af04552 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <[email protected]> Date: Tue, 14 Apr 2009 16:18:44 +0200 Subject: [PATCH] qemu-0.9.0.cvs-binfmt ++++++ 0005-qemu-cvs-alsa_bitfield.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From c288ae94b668f69e51a118f4a4bf40cd3a34420c Mon Sep 17 00:00:00 2001 +From e4b24a62433e546aa16a4e4f9018324086c264e7 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Tue, 14 Apr 2009 16:20:50 +0200 Subject: [PATCH] qemu-cvs-alsa_bitfield ++++++ 0006-qemu-cvs-alsa_ioctl.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 67adcc55cb9043b1ad83821ed4ac937c5c642e9f Mon Sep 17 00:00:00 2001 +From 137788d54993ea8543ed0b42be6a5b026e048b58 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Tue, 14 Apr 2009 16:23:27 +0200 Subject: [PATCH] qemu-cvs-alsa_ioctl ++++++ 0007-qemu-cvs-alsa_mmap.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 4ebd8783b71189cd041058171c2fc21c2283c3c6 Mon Sep 17 00:00:00 2001 +From 75a2031df4adb45576126c055bccee35c0384e64 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Tue, 14 Apr 2009 16:24:15 +0200 Subject: [PATCH] qemu-cvs-alsa_mmap ++++++ 0008-qemu-cvs-gettimeofday.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From a59d2c83f7fbbbf06964c68d411c3876164451e2 Mon Sep 17 00:00:00 2001 +From c40b80d60882ca0a479de9dd14409fd3a2eba6bb Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <[email protected]> Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday ++++++ 0009-qemu-cvs-ioctl_debug.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 32368637cf35ce3495b1e834e116f561b4ba50ee Mon Sep 17 00:00:00 2001 +From 44449256ecf57af6468a63068d72c0e3f5253718 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Tue, 14 Apr 2009 16:26:33 +0200 Subject: [PATCH] qemu-cvs-ioctl_debug ++++++ 0010-qemu-cvs-ioctl_nodirection.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 8cf7f450f84e39841daefcbe1e7d2c2b586da423 Mon Sep 17 00:00:00 2001 +From 397d17731b3236cd11bd3c2191f94280c46eadef Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Tue, 14 Apr 2009 16:27:36 +0200 Subject: [PATCH] qemu-cvs-ioctl_nodirection ++++++ 0011-qemu-img-vmdk-scsi.patch.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From a54f38f19edeca1a17a97d70f892fc5f5c0dec4a Mon Sep 17 00:00:00 2001 +From 24e926bb87d3199d3177358929eacb65af69418e Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <[email protected]> Date: Tue, 14 Apr 2009 16:37:42 +0200 Subject: [PATCH] qemu-img-vmdk-scsi @@ -14,10 +14,10 @@ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c -index af2ab4f..185a9d4 100644 +index 7547051..6a68221 100644 --- a/block.c +++ b/block.c -@@ -4028,7 +4028,7 @@ int bdrv_img_create(const char *filename, const char *fmt, +@@ -4039,7 +4039,7 @@ int bdrv_img_create(const char *filename, const char *fmt, char *options, uint64_t img_size, int flags) { QEMUOptionParameter *param = NULL, *create_options = NULL; @@ -26,7 +26,7 @@ BlockDriverState *bs = NULL; BlockDriver *drv, *proto_drv; BlockDriver *backing_drv = NULL; -@@ -4143,6 +4143,9 @@ int bdrv_img_create(const char *filename, const char *fmt, +@@ -4154,6 +4154,9 @@ int bdrv_img_create(const char *filename, const char *fmt, printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); @@ -81,7 +81,7 @@ }; diff --git a/block_int.h b/block_int.h -index b80e66d..e1c436f 100644 +index 3d4abc6..3d5a855 100644 --- a/block_int.h +++ b/block_int.h @@ -33,6 +33,7 @@ ++++++ 0012-configure-Enable-mipsn32-linux-user.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From b8b5443e2536b424f19f129aab01b314629cf71c Mon Sep 17 00:00:00 2001 +From 90f4c2f9a182626eea2d2ec962d89ada130c22f8 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <[email protected]> Date: Wed, 25 Aug 2010 14:23:43 +0200 Subject: [PATCH] configure: Enable mipsn32*-linux-user builds @@ -10,7 +10,7 @@ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure -index b55a792..ba4e6ef 100755 +index 1f338f8..de92ac2 100755 --- a/configure +++ b/configure @@ -950,6 +950,8 @@ microblaze-linux-user \ ++++++ 0013-linux-user-add-binfmt-wrapper-for-a.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From c0ec70b085b57e2381c49a82f9f7f3ff0f20ef34 Mon Sep 17 00:00:00 2001 +From eaedb8d198e91c3a085df8704b513a3cb524d895 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Fri, 30 Sep 2011 19:40:36 +0200 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling ++++++ 0014-linux-user-Ignore-timer_create-sysc.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 29ad679d9dd393b11ec4fcc6a3cd727f940c0f9a Mon Sep 17 00:00:00 2001 +From 4312a512638d2d70144dce55a63f21dabcfda0cb Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Sun, 11 Dec 2011 01:19:24 +0100 Subject: [PATCH] linux-user: Ignore timer_create syscall ++++++ 0015-linux-user-be-silent-about-capget-f.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 5b4c584e124e65986327b21632704e6fca215b16 Mon Sep 17 00:00:00 2001 +From 0b0a9d0508e5d4290afd272b9523c94761f11e9c Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Sun, 11 Dec 2011 01:21:51 +0100 Subject: [PATCH] linux-user: be silent about capget failures ++++++ 0016-PPC-KVM-Disable-mmu-notifier-check..patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From de50438d31a9932762c2c5d0903ad13c8d55687c Mon Sep 17 00:00:00 2001 +From e975674515cfe9e086341f3684452520908037d9 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Fri, 6 Jan 2012 01:05:55 +0100 Subject: [PATCH] PPC: KVM: Disable mmu notifier check ++++++ 0017-linux-user-fix-segfault-deadlock.pa.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From de5f7df26151409673c7bdeb575b10f445484ba8 Mon Sep 17 00:00:00 2001 +From 203f51827bf2f7e34b13b0ad0b09789ec035aaa9 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Fri, 13 Jan 2012 17:05:41 +0100 Subject: [PATCH] linux-user: fix segfault deadlock ++++++ 0018-linux-user-binfmt-support-host-bina.patch ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -1,4 +1,4 @@ -From 4df8827ec139f55465022210a0d28e65538134cc Mon Sep 17 00:00:00 2001 +From 4790cf690d3015adbe6a9e768d1009535c01ffeb Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Thu, 2 Feb 2012 18:02:33 +0100 Subject: [PATCH] linux-user: binfmt: support host binaries ++++++ 0019-linux-user-ARM-Ignore-immediate-val.patch ++++++ >From 8cc5120497695e7ea8dde9b096eb6c8cb9b6ac35 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Tue, 29 May 2012 17:28:07 +0200 Subject: [PATCH] linux-user: ARM: Ignore immediate value for svc in thumb mode When running in thumb mode, Linux doesn't evaluate the immediate value of the svc instruction, but instead just always assumes the syscall number to be in r7. This fixes executing go_bootstrap while building go for me. Signed-off-by: Alexander Graf <[email protected]> --- linux-user/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 503ecfa..ed48276 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -823,8 +823,7 @@ void cpu_loop(CPUARMState *env) } else if (n == ARM_NR_semihosting || n == ARM_NR_thumb_semihosting) { env->regs[0] = do_arm_semihosting (env); - } else if (n == 0 || n >= ARM_SYSCALL_BASE - || (env->thumb && n == ARM_THUMB_SYSCALL)) { + } else if (n == 0 || n >= ARM_SYSCALL_BASE || env->thumb) { /* linux syscall */ if (env->thumb || n == 0) { n = env->regs[7]; ++++++ 0020-linux-user-arm-no-tb_flush-on-reset.patch ++++++ >From ea18c65ff19aa12001556d7f19145f6eb2e8bcdc Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Tue, 29 May 2012 15:30:01 +0200 Subject: [PATCH] linux-user: arm: no tb_flush on reset When running automoc4 as linux-user guest program, it segfaults right after it creates a thread. Bisecting pointed to commit a84fac1426 which introduces tb_flush on reset. So something in our thread creation is broken. But for now, let's revert the change to at least get a working build again. --- target-arm/cpu.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 7eb323a..2e90e56 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -117,7 +117,11 @@ static void arm_cpu_reset(CPUState *s) * bake assumptions about into translated code, so we need to * tb_flush(). */ +#if !defined(CONFIG_USER_ONLY) + /* XXX hack alert! automoc4 segaults after spawning a new thread with this + flush enabled */ tb_flush(env); +#endif } static inline void set_feature(CPUARMState *env, int feature) ++++++ 0021-linux-user-fix-multi-threaded-proc-.patch ++++++ >From eb42dbe8f2c478276128622b3fe1125e4cd13759 Mon Sep 17 00:00:00 2001 From: Alexander Graf <[email protected]> Date: Wed, 30 May 2012 14:40:47 +0200 Subject: [PATCH] linux-user: fix multi-threaded /proc/self/maps When reading our faked /proc/self/maps from a secondary thread, we get an invalid stack entry. This is because ts->stack_base is not initialized in non-primary threads. However, ts->info is, and the stack layout information we're looking for is there too. So let's use that one instead! Signed-off-by: Alexander Graf <[email protected]> --- linux-user/syscall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 39d02f8..06408bd 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4920,8 +4920,8 @@ static int open_self_maps(void *cpu_env, int fd) #if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) dprintf(fd, "%08llx-%08llx rw-p %08llx 00:00 0 [stack]\n", (unsigned long long)ts->info->stack_limit, - (unsigned long long)(ts->stack_base + (TARGET_PAGE_SIZE - 1)) - & TARGET_PAGE_MASK, + (unsigned long long)(ts->info->start_stack + + (TARGET_PAGE_SIZE - 1)) & TARGET_PAGE_MASK, (unsigned long long)0); #endif ++++++ qemu-1.1.0-rc3.tar.bz2 -> qemu-1.1.0-1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/qemu/qemu-1.1.0-rc3.tar.bz2 /work/SRC/openSUSE:Factory/.qemu.new/qemu-1.1.0-1.tar.bz2 differ: char 11, line 1 ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -21,9 +21,9 @@ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.1.0rc3 +Version: 1.1.0 Release: 0 -Source: %name-1.1.0-rc3.tar.bz2 +Source: %name-%version-1.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc @@ -94,7 +94,7 @@ run cross architectures builds %prep -%setup -q -n qemu-1.1.0-rc3 +%setup -q PATCH_EXEC %build @@ -102,7 +102,6 @@ mkdir -p dynamic # build qemu-system ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ --enable-curl \ @@ -122,7 +121,6 @@ make clean # build userland emus ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ --enable-linux-user \ --disable-system \ --static --disable-linux-aio \ ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.coe3mT/_old 2012-06-10 21:53:06.000000000 +0200 +++ /var/tmp/diff_new_pack.coe3mT/_new 2012-06-10 21:53:06.000000000 +0200 @@ -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-rc3 +GIT_UPSTREAM_TAG=v1.1.0 QEMU_TMP=/dev/shm/qemu-tmp # clean up -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
