pool/qemu
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 243855 from home:coolo:branches:openSUSE:Factory

Browse Source 
- build libcaca from a different spec file to avoid cycles with
  spice

OBS-URL: https://build.opensuse.org/request/show/243855
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=224
This commit is contained in:
Andreas Färber 2014-08-21 12:43:30 +00:00 committed by Git OBS Bridge
parent 2610b7e59f
commit 671d76ae78
15 changed files with 2135 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0039-fix-full-frame-updates-for-VNC-clie.patch
View File

@ -1,33 +0,0 @@
From 7e160ac64df6af7f53c45d5a3cdb2185a2db5720 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.de>
Date: Wed, 23 Jul 2014 16:03:14 +0200
Subject: [PATCH] fix full frame updates for VNC clients
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If the client asks for !incremental frame updates, it has lost its content
so dirty doesn't matter - it has to see the full frame, so setting force_update
Signed-off-by: Stephan Kulow <coolo@suse.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Peter Lieven <pl@kamp.de>
(cherry picked from commit 07535a890200e640517be0ae04fcff28860ecd37)
[AF: BNC#888142]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
ui/vnc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index ab03ee3..75dd0a1 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1887,6 +1887,7 @@ static void framebuffer_update_request(VncState *vs, int incremental,
return;
}
+ vs->force_update = 1;
vnc_set_area_dirty(vs->dirty, width, height, x, y, w, h);
}

65
0040-vnc-update-fix.patch
View File

@ -1,65 +0,0 @@
From 6fc52b247a1e6ff8870ea5e826ceab01983b8b90 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 23 Jul 2014 11:52:02 +0200
Subject: [PATCH] vnc update fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We need to remember has_updates for each vnc client. Otherwise it might
happen that vnc_update_client(has_dirty=1) takes the first exit due to
output buffers not being flushed yet and subsequent calls with
has_dirty=0 take the second exit, wrongly assuming there is nothing to
do because the work defered in the first call is ignored.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Peter Lieven <pl@kamp.de>
(cherry picked from commit 6365828003c8e88bff67d351af4b66c406568a26)
[AF: Relates to BNC#888142]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
ui/vnc.c | 4 +++-
ui/vnc.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 75dd0a1..48e6591 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -888,6 +888,7 @@ static int find_and_clear_dirty_height(struct VncState *vs,
static int vnc_update_client(VncState *vs, int has_dirty, bool sync)
{
+ vs->has_dirty += has_dirty;
if (vs->need_update && vs->csock != -1) {
VncDisplay *vd = vs->vd;
VncJob *job;
@@ -899,7 +900,7 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync)
/* kernel send buffers are full -> drop frames to throttle */
return 0;
- if (!has_dirty && !vs->audio_cap && !vs->force_update)
+ if (!vs->has_dirty && !vs->audio_cap && !vs->force_update)
return 0;
/*
@@ -942,6 +943,7 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync)
vnc_jobs_join(vs);
}
vs->force_update = 0;
+ vs->has_dirty = 0;
return n;
}
diff --git a/ui/vnc.h b/ui/vnc.h
index 8f582fd..334de9d 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -263,6 +263,7 @@ struct VncState
VncDisplay *vd;
int need_update;
int force_update;
+ int has_dirty;
uint32_t features;
int absolute;
int last_x;

1777
libcacard.changes Normal file
View File

File diff suppressed because it is too large Load Diff

192
libcacard.spec Normal file
View File

@ -0,0 +1,192 @@
#
# spec file for package libcacard
#
# Copyright (c) 2014 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: libcacard
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.1.0
Release: 0
Source: http://wiki.qemu.org/download/qemu-%{version}.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
Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch
Patch0004: 0004-qemu-cvs-alsa_bitfield.patch
Patch0005: 0005-qemu-cvs-alsa_ioctl.patch
Patch0006: 0006-qemu-cvs-alsa_mmap.patch
Patch0007: 0007-qemu-cvs-gettimeofday.patch
Patch0008: 0008-qemu-cvs-ioctl_debug.patch
Patch0009: 0009-qemu-cvs-ioctl_nodirection.patch
Patch0010: 0010-block-vmdk-Support-creation-of-SCSI.patch
Patch0011: 0011-linux-user-add-binfmt-wrapper-for-a.patch
Patch0012: 0012-PPC-KVM-Disable-mmu-notifier-check.patch
Patch0013: 0013-linux-user-fix-segfault-deadlock.patch
Patch0014: 0014-linux-user-binfmt-support-host-bina.patch
Patch0015: 0015-target-arm-linux-user-no-tb_flush-o.patch
Patch0016: 0016-linux-user-Ignore-broken-loop-ioctl.patch
Patch0017: 0017-linux-user-lock-tcg.patch
Patch0018: 0018-linux-user-Run-multi-threaded-code-.patch
Patch0019: 0019-linux-user-lock-tb-flushing-too.patch
Patch0020: 0020-linux-user-Fake-proc-cpuinfo.patch
Patch0021: 0021-linux-user-implement-FS_IOC_GETFLAG.patch
Patch0022: 0022-linux-user-implement-FS_IOC_SETFLAG.patch
Patch0023: 0023-linux-user-XXX-disable-fiemap.patch
Patch0024: 0024-slirp-nooutgoing.patch
Patch0025: 0025-vnc-password-file-and-incoming-conn.patch
Patch0026: 0026-linux-user-add-more-blk-ioctls.patch
Patch0027: 0027-linux-user-use-target_ulong.patch
Patch0028: 0028-block-Add-support-for-DictZip-enabl.patch
Patch0029: 0029-block-Add-tar-container-format.patch
Patch0030: 0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
Patch0031: 0031-Legacy-Patch-kvm-qemu-preXX-report-.patch
Patch0032: 0032-console-add-question-mark-escape-op.patch
Patch0033: 0033-Make-char-muxer-more-robust-wrt-sma.patch
Patch0034: 0034-linux-user-lseek-explicitly-cast-no.patch
Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
Source400: update_git.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: e2fsprogs-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libattr-devel
BuildRequires: libtool
BuildRequires: mozilla-nss-devel
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: zlib-devel
%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.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%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 --libdir=%_libdir \
--disable-strip \
--enable-smartcard-nss \
--extra-cflags="$QEMU_OPT_FLAGS"
make %{?_smp_mflags} V=1 libcacard.la
%install
make install-libcacard DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%changelog

116
libcacard.spec.in Normal file
View File

@ -0,0 +1,116 @@
#
# spec file for package libcacard
#
# Copyright (c) 2014 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: libcacard
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
QEMU_VERSION
Release: 0
Source: http://wiki.qemu.org/download/qemu-%{version}.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.
# this is to make lint happy
Source300: qemu-rpmlintrc
Source400: update_git.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: e2fsprogs-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libattr-devel
BuildRequires: ncurses-devel
BuildRequires: python
BuildRequires: zlib-devel
BuildRequires: mozilla-nss-devel
BuildRequires: libtool
%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.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%prep
%setup -q -n qemu-%{version}
PATCH_EXEC
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
--libexecdir=%_libexecdir --libdir=%_libdir \
--disable-strip \
--enable-smartcard-nss \
--extra-cflags="$QEMU_OPT_FLAGS"
make %{?_smp_mflags} V=1 libcacard.la
%install
make install-libcacard DESTDIR=$RPM_BUILD_ROOT
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%changelog

3
qemu-2.1.0-rc3.tar.bz2
View File

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

3
qemu-2.1.0.tar.bz2 Normal file
View File

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

BIN
qemu-2.1.0.tar.bz2.sig Normal file
View File

Binary file not shown.

8
qemu-linux-user.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Aug 6 17:29:09 UTC 2014 - coolo@suse.com
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
* Patches dropped:
0039-fix-full-frame-updates-for-VNC-clie.patch
0040-vnc-update-fix.patch
-------------------------------------------------------------------
Thu Jul 31 13:00:22 UTC 2014 - dimstar@opensuse.org

10
qemu-linux-user.spec
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.0.93
Version: 2.1.0
Release: 0
Source: qemu-2.1.0-rc3.tar.bz2
Source: http://wiki.qemu.org/download/qemu-%{version}.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
@ -63,8 +63,6 @@ Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
Patch0039: 0039-fix-full-frame-updates-for-VNC-clie.patch
Patch0040: 0040-vnc-update-fix.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
Source300: qemu-rpmlintrc
@ -117,7 +115,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n qemu-2.1.0-rc3
%setup -q -n qemu-2.1.0
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -156,8 +154,6 @@ run cross-architecture builds.
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%build
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

4
qemu-linux-user.spec.in
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: qemu-2.1.0-rc3.tar.bz2
Source: http://wiki.qemu.org/download/qemu-%{version}.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.1.0-rc3
%setup -q -n qemu-2.1.0
PATCH_EXEC
%build

19
qemu.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Aug 7 11:12:48 UTC 2014 - coolo@suse.com
- build libcaca from a different spec file to avoid cycles with
spice
-------------------------------------------------------------------
Wed Aug 6 17:29:30 UTC 2014 - coolo@suse.com
- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
-------------------------------------------------------------------
Wed Aug 6 17:29:08 UTC 2014 - coolo@suse.com
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
* Patches dropped:
0039-fix-full-frame-updates-for-VNC-clie.patch
0040-vnc-update-fix.patch
-------------------------------------------------------------------
Thu Jul 31 12:59:39 UTC 2014 - dimstar@opensuse.org

64
qemu.spec
View File

@ -43,9 +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.0.93
Version: 2.1.0
Release: 0
Source: %name-2.1.0-rc3.tar.bz2
Source: http://wiki.qemu.org/download/%name-%{version}.tar.bz2
Source99: http://wiki.qemu.org/download/%name-%{version}.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -92,8 +93,6 @@ Patch0035: 0035-virtfs-proxy-helper-Provide-__u64-f.patch
Patch0036: 0036-configure-Enable-PIE-for-ppc-and-pp.patch
Patch0037: 0037-tests-Don-t-run-qom-test-twice.patch
Patch0038: 0038-qtest-Increase-socket-timeout.patch
Patch0039: 0039-fix-full-frame-updates-for-VNC-clie.patch
Patch0040: 0040-vnc-update-fix.patch
# Please do not add patches manually here, run update_git.sh.
# this is to make lint happy
@ -370,36 +369,6 @@ as PC and PowerMac systems.
This sub-package contains various tools, including a bridge helper.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
@ -487,7 +456,7 @@ This package provides a service file for starting and stopping KSM.
%endif
%prep
%setup -q -n %name-2.1.0-rc3
%setup -q -n %name-2.1.0
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -526,8 +495,6 @@ This package provides a service file for starting and stopping KSM.
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch0040 -p1
%if %{build_x86_fw_from_source}
# as a safeguard, delete the firmware files that we intend to build
@ -610,8 +577,9 @@ make check V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
rm $RPM_BUILD_ROOT/%_libdir/libcacard*
rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name
%if %{legacy_qemu_kvm}
@ -643,9 +611,6 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
%clean
rm -rf ${RPM_BUILD_ROOT}
%pre
%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu 2>/dev/null
@ -669,10 +634,6 @@ fi
%verify_permissions %_libexecdir/qemu-bridge-helper
%endif
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%if 0%{?with_systemd}
%pre ksm
%service_add_pre ksm.service
@ -871,17 +832,6 @@ fi
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga

58
qemu.spec.in
View File

@ -45,7 +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: %name-2.1.0-rc3.tar.bz2
Source: http://wiki.qemu.org/download/%name-%{version}.tar.bz2
Source99: http://wiki.qemu.org/download/%name-%{version}.tar.bz2.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@ -331,36 +332,6 @@ as PC and PowerMac systems.
This sub-package contains various tools, including a bridge helper.
%package -n libcacard0
Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC
%description -n libcacard0
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
%package -n libcacard-devel
Summary: Common Access Card (CAC) emulation -- Development files
Group: Development/Languages/C and C++
Requires: glib2-devel
Requires: libcacard0 = %version
Requires: mozilla-nspr
Requires: mozilla-nss
%description -n libcacard-devel
This emulator is designed to provide emulation of actual smart cards to a
virtual card reader running in a guest virtual machine. The emulated smart
cards can be representations of real smart cards, where the necessary functions
such as signing, card removal/insertion, etc. are mapped to real, physical
cards which are shared with the client machine the emulator is running on, or
the cards could be pure software constructs.
This sub-package contains development files for the Smartcard library.
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
@ -448,7 +419,7 @@ This package provides a service file for starting and stopping KSM.
%endif
%prep
%setup -q -n %name-2.1.0-rc3
%setup -q -n %name-2.1.0
PATCH_EXEC
%if %{build_x86_fw_from_source}
@ -532,8 +503,9 @@ make check V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
rm $RPM_BUILD_ROOT/%_libdir/libcacard*
rm $RPM_BUILD_ROOT/%_libdir/pkgconfig/libcacard.pc
rm -fr $RPM_BUILD_ROOT/%_prefix/include/cacard
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name
%if %{legacy_qemu_kvm}
@ -565,9 +537,6 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-kvm.rules
install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
%fdupes -s $RPM_BUILD_ROOT
%clean
rm -rf ${RPM_BUILD_ROOT}
%pre
%{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm 2>/dev/null
%{_bindir}/getent group qemu >/dev/null || %{_sbindir}/groupadd -r qemu 2>/dev/null
@ -591,10 +560,6 @@ fi
%verify_permissions %_libexecdir/qemu-bridge-helper
%endif
%post -n libcacard0 -p /sbin/ldconfig
%postun -n libcacard0 -p /sbin/ldconfig
%if 0%{?with_systemd}
%pre ksm
%service_add_pre ksm.service
@ -793,17 +758,6 @@ fi
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
%files -n libcacard0
%defattr(-, root, root)
%_libdir/libcacard.so.0*
%files -n libcacard-devel
%defattr(-, root, root)
%dir %_includedir/cacard
%_includedir/cacard/*.h
%_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga

4
update_git.sh
View File

@ -12,7 +12,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
GIT_BRANCH=opensuse-2.1
GIT_UPSTREAM_TAG=v2.1.0-rc3
GIT_UPSTREAM_TAG=v2.1.0
GIT_DIR=/dev/shm/qemu-factory-git-dir
CMP_DIR=/dev/shm/qemu-factory-cmp-dir
@ -87,7 +87,7 @@ rm -rf $GIT_DIR
echo " ${i##*/}" >> qemu.changes.added
done
for package in qemu qemu-linux-user; do
for package in qemu qemu-linux-user libcacard; do
while IFS= read -r line; do
if [ "$line" = "PATCH_FILES" ]; then
for i in 0???-*.patch; do