Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2013-06-05 14:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Changes: -------- New Changes file: --- /dev/null 2013-05-23 01:40:31.032032505 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2013-06-05 14:31:45.000000000 +0200 @@ -0,0 +1,1263 @@ +------------------------------------------------------------------- +Sat May 25 15:50:49 UTC 2013 - [email protected] + +- Amend licenses list with GPL-2.0 (adopted from kvm package) +- virtfs-proxy-helper.1 shouldn't be installed anymore + +------------------------------------------------------------------- +Fri May 24 19:57:35 UTC 2013 - [email protected] + +- Fix ppc builds by packaging /emul/ia32-linux (previously in qemu) + and /usr/share/qemu/qemu-i386 + +------------------------------------------------------------------- +Fri May 24 16:28:50 UTC 2013 - [email protected] + +- Drop unneeded dependencies: SDL, ALSA, bison, cURL, cyrus-sasl, + libaio, libcap, libcap-ng, libgnutls, libjpeg, libpcap, libpng, + pwdutils, timezone +* Reorder BuildRequires alphabetically +- Tidy up suppression of post-build-checks (requested by Adrian) + +------------------------------------------------------------------- +Fri May 24 12:33:23 UTC 2013 - [email protected] + +- Use %{?_smp_mflags} rather than %{?jobs:-j%jobs} + +------------------------------------------------------------------- +Tue May 21 21:13:25 UTC 2013 - [email protected] + +- Split off from qemu.spec.in +* Dropped some dependencies + +------------------------------------------------------------------- +Mon May 20 21:14:08 UTC 2013 - [email protected] + +- Update to v1.5.0 final: Cf. http://wiki.qemu.org/ChangeLog/1.5 +* Adapt update_git.sh accordingly +* Add BuildRequires for gtk2/3 and vte2 to enable new frontend +* Place translations into new qemu-lang package +* Really enable SPICE support from 11.4 in configure, too + +------------------------------------------------------------------- +Fri May 17 13:47:21 UTC 2013 - [email protected] + +- Add BuildRequires for pixman, to avoid using internal version + that fails to build on ppc + +------------------------------------------------------------------- +Thu May 16 10:34:08 UTC 2013 - [email protected] + +- Update to v1.5.0-rc2: Cf. http://wiki.qemu.org/ChangeLog/1.5 +* Adapt update_git.sh accordingly +- Add patch by brogers to fix SLE 11 SP2 build (from kvm package) + +------------------------------------------------------------------- +Tue May 14 13:02:18 UTC 2013 - [email protected] + +- Update to v1.5.0-rc1: Cf. http://wiki.qemu.org/ChangeLog/1.5 +* Adapt update_git.sh accordingly +* TODO file no longer exists, don't try to package it +* Package qemu-mips64{,el} + +------------------------------------------------------------------- +Tue May 14 14:51:20 CEST 2013 - [email protected] + +- Enable spice support starting from 11.4 + +------------------------------------------------------------------- +Tue May 7 19:56:40 UTC 2013 - [email protected] + +- Update to v1.5.0-rc0: Cf. http://wiki.qemu.org/ChangeLog/1.5 +* Adapt update_git.sh script +* Audio cards are now all enabled by default + +------------------------------------------------------------------- +Wed Apr 24 17:15:04 UTC 2013 - [email protected] + +- Enable pa and oss audio drivers, as in kvm package (bnc#737070) +- Enable hda audio card, as done in kvm package (bnc#801794) + +------------------------------------------------------------------- +Mon Apr 22 18:27:18 UTC 2013 - [email protected] + +- Add explicit alsa-devel BuildRequires: this used to (wrongly) be + pulled in by libSDL-devel. + +------------------------------------------------------------------- +Sun Feb 17 11:15:39 UTC 2013 - [email protected] + +- Update licenses from new format_spec_file + +------------------------------------------------------------------- +Sat Feb 16 12:13:58 UTC 2013 - [email protected] + +- Update to v1.4.0: See http://wiki.qemu.org/ChangeLog/1.4 +* Adapt update_git.sh accordingly + +------------------------------------------------------------------- +Sun Feb 10 14:27:36 UTC 2013 - [email protected] + +- Update to v1.4.0-rc1: See http://wiki.qemu.org/ChangeLog/1.4 +* Adapt update_git.sh accordingly +- Update update_git.sh to reference github.com/openSUSE/qemu.git + +------------------------------------------------------------------- +Thu Dec 13 13:30:57 UTC 2012 - [email protected] + +- linux-user: fix lseek with SEEK_END + +------------------------------------------------------------------- +Thu Dec 13 10:47:52 UTC 2012 - [email protected] + +- Cherry pick patches from qemu-kvm into the qemu package: + - 0033-Add-support-for-DictZip-enabled-gzi.patch + - 0034-Add-tar-container-format.patch.patch + - 0035-Legacy-Patch-kvm-qemu-preXX-dictzip.patch + - 0036-Legacy-Patch-kvm-qemu-preXX-report-.patch + - 0037-console-add-question-mark-escape-op.patch + - 0038-Make-char-muxer-more-robust-wrt-sma.patch + +------------------------------------------------------------------- +Wed Dec 5 13:25:31 UTC 2012 - [email protected] + +- Revert memory size constraint, the workaround patch got applied + +------------------------------------------------------------------- +Wed Dec 5 10:37:14 UTC 2012 - [email protected] + +- Update to v1.3.0: see http://wiki.qemu.org/ChangeLog/1.3 +* Update update_git.sh script accordingly + +------------------------------------------------------------------- +Wed Nov 28 12:26:39 UTC 2012 - [email protected] + +- Replace -fno-gcse patch with v3 + +------------------------------------------------------------------- +Tue Nov 27 16:34:29 UTC 2012 - [email protected] + +- Add patch to workaround GCC PR55489 via -fno-gcse, + another step to avoid builds failing with out-of-memory + +------------------------------------------------------------------- +Tue Nov 27 15:56:07 UTC 2012 - [email protected] + +- Add _constraints to request adequate memory to succeed building + +------------------------------------------------------------------- +Tue Nov 27 05:16:13 UTC 2012 - [email protected] + +- Update to v1.3.0-rc1: see http://wiki.qemu.org/ChangeLog/1.3 +* Update update_git.sh accordingly + +------------------------------------------------------------------- +Tue Nov 20 16:46:38 UTC 2012 - [email protected] + +- Update to v1.3.0-rc0: see http://wiki.qemu.org/ChangeLog/1.3 +* Update update_git.sh accordingly +* Disable SPICE for 11.4 since it can no longer be built lacking + pyparsing + +------------------------------------------------------------------- +Tue Oct 10 18:14:59 UTC 2012 - [email protected] + +- use ulong for syscall parameters. fixes lseek with big files + +------------------------------------------------------------------- +Tue Oct 10 17:16:20 UTC 2012 - [email protected] + +- Add more block ioctl handlers for kiwi + +------------------------------------------------------------------- +Tue Oct 9 19:55:32 UTC 2012 - [email protected] + +- Sync qemu.spec.in file, please don't forget! + +------------------------------------------------------------------- +Fri Sep 14 16:22:01 UTC 2012 - [email protected] + +- Don't strip binaries + +------------------------------------------------------------------- +Thu Sep 13 13:12:52 UTC 2012 - [email protected] + +- Add explicit dependency on makeinfo for manpage/doc generation + +------------------------------------------------------------------- +Fri Sep 7 07:04:08 UTC 2012 - [email protected] + +- Add libcap-devel BuildRequires since it's needed to enable VirtFS + support. +- Add libcap-ng-devel BuildRequires to be able to drop privileges + in qemu-bridge-helper. +- Add libjpeg-devel and libpng-devel BuildRequires to enable VNC + jpeg and png support. +- Pass --enable-virtfs to configure to detect changes that will + cause VirtFS support to not be built. ++++ 1066 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2013-05-27 09:58:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2013-06-05 14:31:45.000000000 +0200 @@ -1,0 +2,44 @@ +Sat May 25 15:50:49 UTC 2013 - [email protected] + +- Really enable pulseaudio and oss support (bnc#737070) +- Amend licenses list with GPL-2.0 (adopted from kvm package) +- Be explicit in enabling features our packaging relies on +- Disable stripping at QEMU level +- Use %optflags rather than $QEMU_OPT_FLAGS + +------------------------------------------------------------------- +Fri May 24 19:57:35 UTC 2013 - [email protected] + +- Move /emul/ia32-linux to qemu-linux-user + +------------------------------------------------------------------- +Fri May 24 17:11:36 UTC 2013 - [email protected] + +- Drop dependency on bison +* Reorder BuildRequires alphabetically +- Fix summary of qemu-lang sub-package +- Drop post-build-checks suppression (qemu-linux-user only) + +------------------------------------------------------------------- +Fri May 24 14:31:59 UTC 2013 - [email protected] + +- Enable brlapi as done for kvm package + +------------------------------------------------------------------- +Fri May 24 12:33:23 UTC 2013 - [email protected] + +- Use %{?_smp_mflags} rather than %{?jobs:-j%jobs} + +------------------------------------------------------------------- +Thu May 23 15:08:42 UTC 2013 - [email protected] + +- Extend virtfs typedef workaround to ppc64 for SLE_11_SP2 + +------------------------------------------------------------------- +Tue May 21 21:13:04 UTC 2013 - [email protected] + +- Split off qemu-linux-user package into separate .spec file. +* Simplified %build and %install sections +* Dropped *-static dependencies + +------------------------------------------------------------------- New: ---- qemu-linux-user.changes qemu-linux-user.spec qemu-linux-user.spec.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu-linux-user.spec ++++++ # # spec file for package qemu-linux-user # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: qemu-linux-user 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: 1.5.0 Release: 0 Source: qemu-%version.tar.bz2 Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch.patch Patch0004: 0004-qemu-cvs-alsa_bitfield.patch.patch Patch0005: 0005-qemu-cvs-alsa_ioctl.patch.patch Patch0006: 0006-qemu-cvs-alsa_mmap.patch.patch Patch0007: 0007-qemu-cvs-gettimeofday.patch.patch Patch0008: 0008-qemu-cvs-ioctl_debug.patch.patch Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch.patch Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch Patch0012: 0012-linux-user-Ignore-timer_create-sysc.patch Patch0013: 0013-linux-user-be-silent-about-capget-f.patch Patch0014: 0014-PPC-KVM-Disable-mmu-notifier-check..patch Patch0015: 0015-linux-user-fix-segfault-deadlock.pa.patch Patch0016: 0016-linux-user-binfmt-support-host-bina.patch Patch0017: 0017-linux-user-arm-no-tb_flush-on-reset.patch Patch0018: 0018-linux-user-Ignore-broken-loop-ioctl.patch Patch0019: 0019-linux-user-fix-segmentation-fault-p.patch Patch0020: 0020-linux-user-lock-tcg.patch.patch Patch0021: 0021-linux-user-Run-multi-threaded-code-.patch Patch0022: 0022-linux-user-lock-tb-flushing-too.pat.patch Patch0023: 0023-linux-user-Fake-proc-cpuinfo.patch.patch Patch0024: 0024-linux-user-implement-FS_IOC_GETFLAG.patch Patch0025: 0025-linux-user-implement-FS_IOC_SETFLAG.patch Patch0026: 0026-linux-user-XXX-disable-fiemap.patch.patch Patch0027: 0027-slirp-nooutgoing.patch.patch Patch0028: 0028-vnc-password-file-and-incoming-conn.patch Patch0029: 0029-linux-user-add-more-blk-ioctls.patc.patch Patch0030: 0030-linux-user-use-target_ulong.patch.patch Patch0031: 0031-Add-support-for-DictZip-enabled-gzi.patch Patch0032: 0032-Add-tar-container-format.patch.patch Patch0033: 0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch Patch0034: 0034-Legacy-Patch-kvm-qemu-preXX-report-.patch Patch0035: 0035-console-add-question-mark-escape-op.patch Patch0036: 0036-Make-char-muxer-more-robust-wrt-sma.patch Patch0037: 0037-linux-user-lseek-explicitly-cast-en.patch Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch # this is to make lint happy Source300: rpmlintrc Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: e2fsprogs-devel BuildRequires: fdupes %if 0%{?suse_version} >= 1140 BuildRequires: glib2-devel-static %else BuildRequires: glib2-devel %endif %if 0%{?suse_version} >= 1210 BuildRequires: glibc-devel-static %endif %if 0%{?suse_version} >= 1210 BuildRequires: libattr-devel-static %else BuildRequires: libattr-devel %endif %if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif BuildRequires: ncurses-devel %if 0%{?suse_version} >= 1220 BuildRequires: pcre-devel-static %endif BuildRequires: python %if 0%{?suse_version} >= 1120 BuildRequires: zlib-devel-static %else BuildRequires: zlib-devel %endif # we must not install the qemu-linux-user package when under QEMU build %if 0%{?qemu_user_space_build:1} #!BuildIgnore: post-build-checks %endif Provides: qemu:%_bindir/qemu-arm %description QEMU is an extremely well-performing CPU emulator that allows you to choose between simulating an entire system and running userspace binaries for different architectures under your native operating system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well as PC and PowerMac systems. This sub-package contains statically linked binaries for running linux-user emulations. This can be used together with the OBS build script to run cross-architecture builds. %prep %setup -q -n qemu-%version %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 %patch0005 -p1 %patch0006 -p1 %patch0007 -p1 %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 %patch0011 -p1 %patch0012 -p1 %patch0013 -p1 %patch0014 -p1 %patch0015 -p1 %patch0016 -p1 %patch0017 -p1 %patch0018 -p1 %patch0019 -p1 %patch0020 -p1 %patch0021 -p1 %patch0022 -p1 %patch0023 -p1 %patch0024 -p1 %patch0025 -p1 %patch0026 -p1 %patch0027 -p1 %patch0028 -p1 %patch0029 -p1 %patch0030 -p1 %patch0031 -p1 %patch0032 -p1 %patch0033 -p1 %patch0034 -p1 %patch0035 -p1 %patch0036 -p1 %patch0037 -p1 %patch0038 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ --libexecdir=%_libexecdir \ --enable-linux-user \ --disable-system \ --disable-tools \ --disable-guest-agent \ --static --disable-linux-aio \ --disable-fdt \ --without-pixman \ --disable-blobs \ --disable-strip \ --extra-cflags="$QEMU_OPT_FLAGS" %if 0%{?suse_version} == 1140 # -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak %endif make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu.1 rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1 rm -rf $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8 rm -rf $RPM_BUILD_ROOT/%_datadir/qemu/keymaps rm -rf $RPM_BUILD_ROOT/%_sysconfdir/qemu/target-x86_64.conf rm -rf $RPM_BUILD_ROOT/%_libexecdir/qemu-bridge-helper install -d -m 755 $RPM_BUILD_ROOT/%_sbindir install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir %ifnarch %ix86 x86_64 ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 %endif %ifnarch ia64 mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux %endif %fdupes -s $RPM_BUILD_ROOT %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-, root, root) %_bindir/qemu-alpha %_bindir/qemu-arm %_bindir/qemu-armeb %_bindir/qemu-cris %_bindir/qemu-i386 %_bindir/qemu-m68k %_bindir/qemu-microblaze %_bindir/qemu-microblazeel %_bindir/qemu-mips %_bindir/qemu-mipsel %_bindir/qemu-mipsn32 %_bindir/qemu-mipsn32el %_bindir/qemu-mips64 %_bindir/qemu-mips64el %_bindir/qemu-or32 %_bindir/qemu-ppc64abi32 %_bindir/qemu-ppc64 %_bindir/qemu-ppc %_bindir/qemu-s390x %_bindir/qemu-sh4 %_bindir/qemu-sh4eb %_bindir/qemu-sparc32plus %_bindir/qemu-sparc64 %_bindir/qemu-sparc %_bindir/qemu-unicore32 %_bindir/qemu-x86_64 %_bindir/qemu-*-binfmt %_sbindir/qemu-binfmt-conf.sh %ifnarch %ix86 x86_64 ia64 %dir /emul/ia32-linux %endif %ifnarch %ix86 x86_64 %dir /usr/share/qemu /usr/share/qemu/qemu-i386 %endif %changelog ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.anl3MC/_old 2013-06-05 14:31:46.000000000 +0200 +++ /var/tmp/diff_new_pack.anl3MC/_new 2013-06-05 14:31:46.000000000 +0200 @@ -19,7 +19,7 @@ Name: qemu Url: http://www.qemu.org/ Summary: Universal CPU emulator -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT +License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC Version: 1.5.0 Release: 0 @@ -69,11 +69,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: alsa-devel -BuildRequires: bison BuildRequires: bluez-devel +%if 0%{?suse_version} >= 1130 +BuildRequires: brlapi-devel +%endif BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +BuildRequires: fdupes +BuildRequires: glib2-devel %if 0%{?suse_version} >= 1220 BuildRequires: gtk3-devel %else @@ -84,53 +88,33 @@ BuildRequires: libattr-devel BuildRequires: libcap-devel BuildRequires: libcap-ng-devel +%ifarch ppc ppc64 +#we need that for -M pseries support in SLES +BuildRequires: libfdt1-devel +%endif BuildRequires: libgnutls-devel BuildRequires: libjpeg-devel BuildRequires: libpcap-devel +BuildRequires: libpixman-1-0-devel BuildRequires: libpng-devel +BuildRequires: libpulse-devel +BuildRequires: libvdeplug3-devel %if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif BuildRequires: ncurses-devel -# we must not install the qemu package when under qemu build -%if 0%{?qemu_user_space_build:1} -BuildRequires: -post-build-checks -%endif +BuildRequires: pwdutils +BuildRequires: python %if 0%{?suse_version} >= 1210 BuildRequires: vte2-devel %endif -%if 0%{?suse_version} >= 1120 -BuildRequires: zlib-devel-static -%else BuildRequires: zlib-devel -%endif -%if 0%{?suse_version} >= 1210 -BuildRequires: glibc-devel-static -BuildRequires: libattr-devel-static -BuildRequires: libfdt1-devel -%endif -%if 0%{?suse_version} >= 1140 -BuildRequires: glib2-devel-static -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: pcre-devel-static -%endif %if 0%{?suse_version} >= 1140 %ifarch %ix86 x86_64 BuildRequires: libspice-server-devel BuildRequires: spice-protocol-devel %endif %endif -%ifarch ppc ppc64 -#we need that for -M pseries support in SLES -BuildRequires: libfdt1-devel -%endif -BuildRequires: fdupes -BuildRequires: glib2-devel -BuildRequires: libpixman-1-0-devel -BuildRequires: libvdeplug3-devel -BuildRequires: pwdutils -BuildRequires: python Requires: /usr/sbin/groupadd Requires: pwdutils Requires: timezone @@ -145,7 +129,7 @@ %if 0%{?suse_version} >= 1210 %package lang -Summary: Universal CPU emulator -- Guest agent +Summary: Universal CPU emulator -- Translations Group: System/Emulators/PC %description lang @@ -187,22 +171,6 @@ This sub-package contains the guest agent. -%package linux-user -Summary: Universal CPU emulator -- Linux User binaries -Group: System/Emulators/PC -Provides: qemu:%_bindir/qemu-arm - -%description linux-user -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. - -This sub-package contains statically linked binaries for running linux-user -emulations. This can be used together with the OBS build script to -run cross-architecture builds. - %prep %setup -q #-n %name-1.5.0-rc2 %patch0001 -p1 @@ -245,73 +213,48 @@ %patch0038 -p1 %build -# build QEMU -mkdir -p dynamic -# build qemu-system ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ --libexecdir=%_libexecdir \ - --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ + --extra-cflags="%{optflags}" \ + --disable-strip \ + --enable-system --disable-linux-user \ + --enable-tools --enable-guest-agent \ + --enable-docs \ + --audio-drv-list="pa alsa sdl oss" --enable-mixemu \ +%if 0%{?suse_version} >= 1130 + --enable-brlapi \ +%endif + --enable-cap-ng \ --enable-curl \ - --enable-virtfs \ - --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ + --enable-curses \ %if 0%{?suse_version} >= 1210 --enable-gtk \ %endif + --enable-linux-aio \ + --enable-sdl \ %if 0%{?suse_version} >= 1140 %ifarch %ix86 x86_64 - --enable-spice + --enable-spice \ %else - --disable-spice + --disable-spice \ %endif %else - --disable-spice -%endif -make %{?jobs:-j%jobs} V=1 -mv *-softmmu/qemu-system-* dynamic -mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic -mv qemu-img.1 qemu-nbd.8 dynamic -mv qemu-ga dynamic -mv fsdev/virtfs-proxy-helper{,.1} dynamic -make clean -# build userland emus -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --libexecdir=%_libexecdir \ - --enable-linux-user \ - --disable-system \ - --static --disable-linux-aio \ - --disable-strip \ - --extra-cflags="$QEMU_OPT_FLAGS" -%if 0%{?suse_version} == 1140 -# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime -sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak + --disable-spice \ %endif -make %{?jobs:-j%jobs} V=1 + --enable-vde \ + --enable-virtfs \ + --enable-vnc-jpeg \ + --enable-vnc-png \ + --enable-vnc-sasl \ + --enable-vnc-tls \ + --enable-vnc-ws \ + +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc -install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/virtfs-proxy-helper $RPM_BUILD_ROOT/%_bindir -install -d -m 755 $RPM_BUILD_ROOT/%_sbindir -install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir -install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir -install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir -install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1 -install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1 -install -m 644 dynamic/virtfs-proxy-helper.1 $RPM_BUILD_ROOT/%_mandir/man1 -install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8 -install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf -%ifnarch %ix86 x86_64 -ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 -%endif -%ifnarch ia64 -mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux -%endif %if 0%{?suse_version} >= 1210 %find_lang %name %endif @@ -341,9 +284,6 @@ %_bindir/qemu-system-* %doc %_mandir/man1/qemu.1.gz %_datadir/%name -%ifnarch %ix86 x86_64 ia64 -%dir /emul/ia32-linux -%endif %dir %_sysconfdir/%name %config %_sysconfdir/%name/target-x86_64.conf @@ -369,35 +309,4 @@ %defattr(-, root, root) %attr(755,root,kvm) %_bindir/qemu-ga -%files linux-user -%defattr(-, root, root) -%_bindir/qemu-alpha -%_bindir/qemu-arm -%_bindir/qemu-armeb -%_bindir/qemu-cris -%_bindir/qemu-i386 -%_bindir/qemu-m68k -%_bindir/qemu-microblaze -%_bindir/qemu-microblazeel -%_bindir/qemu-mips -%_bindir/qemu-mipsel -%_bindir/qemu-mipsn32 -%_bindir/qemu-mipsn32el -%_bindir/qemu-mips64 -%_bindir/qemu-mips64el -%_bindir/qemu-or32 -%_bindir/qemu-ppc64abi32 -%_bindir/qemu-ppc64 -%_bindir/qemu-ppc -%_bindir/qemu-s390x -%_bindir/qemu-sh4 -%_bindir/qemu-sh4eb -%_bindir/qemu-sparc32plus -%_bindir/qemu-sparc64 -%_bindir/qemu-sparc -%_bindir/qemu-unicore32 -%_bindir/qemu-x86_64 -%_bindir/qemu-*-binfmt -%_sbindir/qemu-binfmt-conf.sh - %changelog ++++++ 0038-virtfs-proxy-helper-Provide-__u64-f.patch ++++++ --- /var/tmp/diff_new_pack.anl3MC/_old 2013-06-05 14:31:46.000000000 +0200 +++ /var/tmp/diff_new_pack.anl3MC/_new 2013-06-05 14:31:46.000000000 +0200 @@ -1,19 +1,21 @@ -From 7983edf59204dc1fdfa07872c6ce3d0f2d520b29 Mon Sep 17 00:00:00 2001 +From 563299dd5726bc6c7f2bc21ba101f965cf0c9fba Mon Sep 17 00:00:00 2001 From: Bruce Rogers <[email protected]> Date: Thu, 16 May 2013 12:39:10 +0200 Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken sys/capability.h Fixes the build on SLE 11 SP2. + +[AF: Extend to ppc64] --- - fsdev/virtfs-proxy-helper.c | 4 ++++ - 1 file changed, 4 insertions(+) + fsdev/virtfs-proxy-helper.c | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c -index 713a7b2..0459bdf 100644 +index 713a7b2..b8da77d 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c -@@ -9,6 +9,10 @@ +@@ -9,6 +9,13 @@ * the COPYING file in the top-level directory. */ @@ -21,6 +23,9 @@ +#if defined(__i386__) +typedef unsigned long long __u64; +#endif ++#if defined(__powerpc64__) ++#include <asm/types.h> ++#endif #include <sys/resource.h> #include <getopt.h> #include <syslog.h> ++++++ qemu-linux-user.spec.in ++++++ # # spec file for package qemu-linux-user # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: qemu-linux-user 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: 1.5.0 Release: 0 Source: qemu-%version.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: e2fsprogs-devel BuildRequires: fdupes %if 0%{?suse_version} >= 1140 BuildRequires: glib2-devel-static %else BuildRequires: glib2-devel %endif %if 0%{?suse_version} >= 1210 BuildRequires: glibc-devel-static %endif %if 0%{?suse_version} >= 1210 BuildRequires: libattr-devel-static %else BuildRequires: libattr-devel %endif %if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif BuildRequires: ncurses-devel %if 0%{?suse_version} >= 1220 BuildRequires: pcre-devel-static %endif BuildRequires: python %if 0%{?suse_version} >= 1120 BuildRequires: zlib-devel-static %else BuildRequires: zlib-devel %endif # we must not install the qemu-linux-user package when under QEMU build %if 0%{?qemu_user_space_build:1} #!BuildIgnore: post-build-checks %endif Provides: qemu:%_bindir/qemu-arm %description QEMU is an extremely well-performing CPU emulator that allows you to choose between simulating an entire system and running userspace binaries for different architectures under your native operating system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well as PC and PowerMac systems. This sub-package contains statically linked binaries for running linux-user emulations. This can be used together with the OBS build script to run cross-architecture builds. %prep %setup -q -n qemu-%version PATCH_EXEC %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ --libexecdir=%_libexecdir \ --enable-linux-user \ --disable-system \ --disable-tools \ --disable-guest-agent \ --static --disable-linux-aio \ --disable-fdt \ --without-pixman \ --disable-blobs \ --disable-strip \ --extra-cflags="$QEMU_OPT_FLAGS" %if 0%{?suse_version} == 1140 # -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak %endif make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu.1 rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1 rm -rf $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8 rm -rf $RPM_BUILD_ROOT/%_datadir/qemu/keymaps rm -rf $RPM_BUILD_ROOT/%_sysconfdir/qemu/target-x86_64.conf rm -rf $RPM_BUILD_ROOT/%_libexecdir/qemu-bridge-helper install -d -m 755 $RPM_BUILD_ROOT/%_sbindir install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir %ifnarch %ix86 x86_64 ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 %endif %ifnarch ia64 mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux %endif %fdupes -s $RPM_BUILD_ROOT %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-, root, root) %_bindir/qemu-alpha %_bindir/qemu-arm %_bindir/qemu-armeb %_bindir/qemu-cris %_bindir/qemu-i386 %_bindir/qemu-m68k %_bindir/qemu-microblaze %_bindir/qemu-microblazeel %_bindir/qemu-mips %_bindir/qemu-mipsel %_bindir/qemu-mipsn32 %_bindir/qemu-mipsn32el %_bindir/qemu-mips64 %_bindir/qemu-mips64el %_bindir/qemu-or32 %_bindir/qemu-ppc64abi32 %_bindir/qemu-ppc64 %_bindir/qemu-ppc %_bindir/qemu-s390x %_bindir/qemu-sh4 %_bindir/qemu-sh4eb %_bindir/qemu-sparc32plus %_bindir/qemu-sparc64 %_bindir/qemu-sparc %_bindir/qemu-unicore32 %_bindir/qemu-x86_64 %_bindir/qemu-*-binfmt %_sbindir/qemu-binfmt-conf.sh %ifnarch %ix86 x86_64 ia64 %dir /emul/ia32-linux %endif %ifnarch %ix86 x86_64 %dir /usr/share/qemu /usr/share/qemu/qemu-i386 %endif %changelog ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.anl3MC/_old 2013-06-05 14:31:46.000000000 +0200 +++ /var/tmp/diff_new_pack.anl3MC/_new 2013-06-05 14:31:46.000000000 +0200 @@ -19,7 +19,7 @@ Name: qemu Url: http://www.qemu.org/ Summary: Universal CPU emulator -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT +License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC Version: 1.5.0 Release: 0 @@ -32,11 +32,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: alsa-devel -BuildRequires: bison BuildRequires: bluez-devel +%if 0%{?suse_version} >= 1130 +BuildRequires: brlapi-devel +%endif BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +BuildRequires: fdupes +BuildRequires: glib2-devel %if 0%{?suse_version} >= 1220 BuildRequires: gtk3-devel %else @@ -47,53 +51,33 @@ BuildRequires: libattr-devel BuildRequires: libcap-devel BuildRequires: libcap-ng-devel +%ifarch ppc ppc64 +#we need that for -M pseries support in SLES +BuildRequires: libfdt1-devel +%endif BuildRequires: libgnutls-devel BuildRequires: libjpeg-devel BuildRequires: libpcap-devel +BuildRequires: libpixman-1-0-devel BuildRequires: libpng-devel +BuildRequires: libpulse-devel +BuildRequires: libvdeplug3-devel %if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif BuildRequires: ncurses-devel -# we must not install the qemu package when under qemu build -%if 0%{?qemu_user_space_build:1} -BuildRequires: -post-build-checks -%endif +BuildRequires: pwdutils +BuildRequires: python %if 0%{?suse_version} >= 1210 BuildRequires: vte2-devel %endif -%if 0%{?suse_version} >= 1120 -BuildRequires: zlib-devel-static -%else BuildRequires: zlib-devel -%endif -%if 0%{?suse_version} >= 1210 -BuildRequires: glibc-devel-static -BuildRequires: libattr-devel-static -BuildRequires: libfdt1-devel -%endif -%if 0%{?suse_version} >= 1140 -BuildRequires: glib2-devel-static -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: pcre-devel-static -%endif %if 0%{?suse_version} >= 1140 %ifarch %ix86 x86_64 BuildRequires: libspice-server-devel BuildRequires: spice-protocol-devel %endif %endif -%ifarch ppc ppc64 -#we need that for -M pseries support in SLES -BuildRequires: libfdt1-devel -%endif -BuildRequires: fdupes -BuildRequires: glib2-devel -BuildRequires: libpixman-1-0-devel -BuildRequires: libvdeplug3-devel -BuildRequires: pwdutils -BuildRequires: python Requires: /usr/sbin/groupadd Requires: pwdutils Requires: timezone @@ -108,7 +92,7 @@ %if 0%{?suse_version} >= 1210 %package lang -Summary: Universal CPU emulator -- Guest agent +Summary: Universal CPU emulator -- Translations Group: System/Emulators/PC %description lang @@ -150,94 +134,53 @@ This sub-package contains the guest agent. -%package linux-user -Summary: Universal CPU emulator -- Linux User binaries -Group: System/Emulators/PC -Provides: qemu:%_bindir/qemu-arm - -%description linux-user -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. - -This sub-package contains statically linked binaries for running linux-user -emulations. This can be used together with the OBS build script to -run cross-architecture builds. - %prep %setup -q #-n %name-1.5.0-rc2 PATCH_EXEC %build -# build QEMU -mkdir -p dynamic -# build qemu-system ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ --libexecdir=%_libexecdir \ - --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ + --extra-cflags="%{optflags}" \ + --disable-strip \ + --enable-system --disable-linux-user \ + --enable-tools --enable-guest-agent \ + --enable-docs \ + --audio-drv-list="pa alsa sdl oss" --enable-mixemu \ +%if 0%{?suse_version} >= 1130 + --enable-brlapi \ +%endif + --enable-cap-ng \ --enable-curl \ - --enable-virtfs \ - --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ + --enable-curses \ %if 0%{?suse_version} >= 1210 --enable-gtk \ %endif + --enable-linux-aio \ + --enable-sdl \ %if 0%{?suse_version} >= 1140 %ifarch %ix86 x86_64 - --enable-spice + --enable-spice \ %else - --disable-spice + --disable-spice \ %endif %else - --disable-spice -%endif -make %{?jobs:-j%jobs} V=1 -mv *-softmmu/qemu-system-* dynamic -mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic -mv qemu-img.1 qemu-nbd.8 dynamic -mv qemu-ga dynamic -mv fsdev/virtfs-proxy-helper{,.1} dynamic -make clean -# build userland emus -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --libexecdir=%_libexecdir \ - --enable-linux-user \ - --disable-system \ - --static --disable-linux-aio \ - --disable-strip \ - --extra-cflags="$QEMU_OPT_FLAGS" -%if 0%{?suse_version} == 1140 -# -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime -sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak + --disable-spice \ %endif -make %{?jobs:-j%jobs} V=1 + --enable-vde \ + --enable-virtfs \ + --enable-vnc-jpeg \ + --enable-vnc-png \ + --enable-vnc-sasl \ + --enable-vnc-tls \ + --enable-vnc-ws \ + +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc -install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir -install -m 755 dynamic/virtfs-proxy-helper $RPM_BUILD_ROOT/%_bindir -install -d -m 755 $RPM_BUILD_ROOT/%_sbindir -install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir -install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir -install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir -install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1 -install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1 -install -m 644 dynamic/virtfs-proxy-helper.1 $RPM_BUILD_ROOT/%_mandir/man1 -install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8 -install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf -%ifnarch %ix86 x86_64 -ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 -%endif -%ifnarch ia64 -mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux -%endif %if 0%{?suse_version} >= 1210 %find_lang %name %endif @@ -267,9 +210,6 @@ %_bindir/qemu-system-* %doc %_mandir/man1/qemu.1.gz %_datadir/%name -%ifnarch %ix86 x86_64 ia64 -%dir /emul/ia32-linux -%endif %dir %_sysconfdir/%name %config %_sysconfdir/%name/target-x86_64.conf @@ -295,35 +235,4 @@ %defattr(-, root, root) %attr(755,root,kvm) %_bindir/qemu-ga -%files linux-user -%defattr(-, root, root) -%_bindir/qemu-alpha -%_bindir/qemu-arm -%_bindir/qemu-armeb -%_bindir/qemu-cris -%_bindir/qemu-i386 -%_bindir/qemu-m68k -%_bindir/qemu-microblaze -%_bindir/qemu-microblazeel -%_bindir/qemu-mips -%_bindir/qemu-mipsel -%_bindir/qemu-mipsn32 -%_bindir/qemu-mipsn32el -%_bindir/qemu-mips64 -%_bindir/qemu-mips64el -%_bindir/qemu-or32 -%_bindir/qemu-ppc64abi32 -%_bindir/qemu-ppc64 -%_bindir/qemu-ppc -%_bindir/qemu-s390x -%_bindir/qemu-sh4 -%_bindir/qemu-sh4eb -%_bindir/qemu-sparc32plus -%_bindir/qemu-sparc64 -%_bindir/qemu-sparc -%_bindir/qemu-unicore32 -%_bindir/qemu-x86_64 -%_bindir/qemu-*-binfmt -%_sbindir/qemu-binfmt-conf.sh - %changelog ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.anl3MC/_old 2013-06-05 14:31:47.000000000 +0200 +++ /var/tmp/diff_new_pack.anl3MC/_new 2013-06-05 14:31:47.000000000 +0200 @@ -11,7 +11,7 @@ # when it comes. GIT_TREE=git://github.com/openSUSE/qemu.git -GIT_LOCAL_TREE=/suse/agraf/git/qemu +GIT_LOCAL_TREE=/home/andreas/QEMU/qemu-opensuse GIT_BRANCH=opensuse-1.5 GIT_UPSTREAM_TAG=v1.5.0 QEMU_TMP=/dev/shm/qemu-tmp @@ -20,7 +20,7 @@ if [ -e 0001-* ]; then osc rm --force 0* fi -rm -f qemu.spec +rm -f qemu.spec qemu-linux-user.spec # fetch all patches rm -rf $QEMU_TMP @@ -49,8 +49,9 @@ mv "$PATCHNAME.tmp" "$PATCHNAME" done -# we have all patches as files now - generate the spec file! -while IFS= read -r line; do +# we have all patches as files now - generate the spec files! +for package in qemu qemu-linux-user; do + while IFS= read -r line; do if [ "$line" = "PATCH_FILES" ]; then for i in 0*; do NUM=${i%%-*} @@ -64,6 +65,7 @@ else echo "$line" fi -done < qemu.spec.in > qemu.spec + done < $package.spec.in > $package.spec +done osc add 0* -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
