- add kvm group (from qemu-kvm spec)

[packages/qemu.git] / qemu-system-libcacard.patch

diff --git a/qemu-system-libcacard.patch b/qemu-system-libcacard.patch
index 713bb264b54bd3e157a0cfbbf26db3127ad89d95..088680660abff26193d907f386f6cc692f7337a1 100644 (file)
--- a/qemu-system-libcacard.patch
+++ b/qemu-system-libcacard.patch
@@ -38,18 +38,6 @@
  fi
  
  if test "$usb_redir" = "yes" ; then
-diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c
---- qemu-kvm-1.2.0/hw/ccid-card-passthru.c     2012-09-06 10:31:27.000000000 +0200
-+++ qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c    2012-11-09 07:44:11.286748135 +0100
-@@ -12,7 +12,7 @@
- #include "qemu_socket.h"
- #include "monitor.h"
- #include "hw/ccid.h"
--#include "libcacard/vscard_common.h"
-+#include <cacard/vscard_common.h>
- 
- #define DPRINTF(card, lvl, fmt, ...)                    \
- do {                                                    \
 --- qemu-1.3.0/Makefile.orig   2012-12-03 20:37:05.000000000 +0100
 +++ qemu-1.3.0/Makefile        2012-12-16 11:08:58.001201236 +0100
 @@ -111,9 +111,6 @@
@@ -62,26 +50,9 @@ diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/
  
  all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
  
-diff -ur qemu-kvm-1.2.0/Makefile.objs qemu-kvm-1.2.0-system-libcacard/Makefile.objs
---- qemu-kvm-1.2.0/Makefile.objs       2012-09-06 10:31:27.000000000 +0200
-+++ qemu-kvm-1.2.0-system-libcacard/Makefile.objs      2012-11-09 07:45:10.880079366 +0100
-@@ -34,15 +34,6 @@
- endif
- 
- ######################################################################
--# smartcard
--
--libcacard-y += libcacard/cac.o libcacard/event.o
--libcacard-y += libcacard/vcard.o libcacard/vreader.o
--libcacard-y += libcacard/vcard_emul_nss.o
--libcacard-y += libcacard/vcard_emul_type.o
--libcacard-y += libcacard/card_7816.o
--
--######################################################################
- # Target independent part of system emulation. The long term path is to
- # suppress *all* target specific code in case of system emulation, i.e. a
- # single QEMU executable should support all CPUs and machines.
-@@ -81,8 +72,6 @@
+--- qemu-1.5.0/Makefile.objs.orig      2013-05-20 17:34:39.000000000 +0200
++++ qemu-1.5.0/Makefile.objs   2013-05-26 17:46:51.190865264 +0200
+@@ -74,8 +74,6 @@
  
  common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
  
@@ -90,3 +61,14 @@ diff -ur qemu-kvm-1.2.0/Makefile.objs qemu-kvm-1.2.0-system-libcacard/Makefile.o
  ######################################################################
  # qapi
  
+--- qemu-1.5.0/hw/usb/ccid-card-passthru.c.orig        2013-05-20 17:34:39.000000000 +0200
++++ qemu-1.5.0/hw/usb/ccid-card-passthru.c     2013-05-26 17:58:20.660836330 +0200
+@@ -12,7 +12,7 @@
+ #include "qemu/sockets.h"
+ #include "monitor/monitor.h"
+ #include "ccid.h"
+-#include "libcacard/vscard_common.h"
++#include <cacard/vscard_common.h>
+ 
+ #define DPRINTF(card, lvl, fmt, ...)                    \
+ do {                                                    \