[packages/qemu] - updated to 1.4.0; 1.3.0 left on qemu-1.3 branch
adamg
adamg at pld-linux.org
Tue Feb 19 19:53:46 CET 2013
commit f8ecc2ec0a18d2d6afc25597634616890396b1db
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date: Tue Feb 19 19:53:33 2013 +0100
- updated to 1.4.0; 1.3.0 left on qemu-1.3 branch
qemu-cflags.patch | 20 +++---
qemu-system-libcacard.patch | 146 ++++++++++++--------------------------------
qemu.spec | 8 +--
3 files changed, 52 insertions(+), 122 deletions(-)
---
diff --git a/qemu.spec b/qemu.spec
index 7d59eb4..2ffeba6 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -22,12 +22,12 @@
Summary: QEMU CPU Emulator
Summary(pl.UTF-8): QEMU - emulator procesora
Name: qemu
-Version: 1.3.1
-Release: 1
+Version: 1.4.0
+Release: 0.1
License: GPL v2+
Group: Applications/Emulators
Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 5dbc6c22f47efca71dfaae0dd80dcf9e
+# Source0-md5: 78f13b774814b6b7ebcaf4f9b9204318
Patch0: %{name}-cflags.patch
Patch1: vgabios-widescreens.patch
Patch2: %{name}-whitelist.patch
@@ -514,7 +514,6 @@ ln -s ../error.h qapi/error.h
%{__enable_disable sdl} \
--enable-seccomp \
%{__enable_disable spice} \
- --enable-smartcard \
--enable-smartcard-nss \
--enable-usb-redir \
--enable-uuid \
@@ -590,6 +589,7 @@ fi
%{_datadir}/%{name}/keymaps
%{_datadir}/%{name}/qemu-icon.bmp
# various bios images
+%{_datadir}/%{name}/*.aml
%{_datadir}/%{name}/*.bin
%{_datadir}/%{name}/*.rom
%{_datadir}/%{name}/*.dtb
diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index 15774d8..b992962 100644
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -3,7 +3,7 @@
@@ -281,10 +281,6 @@
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
+ QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
-if test "$debug_info" = "yes"; then
- CFLAGS="-g $CFLAGS"
- LDFLAGS="-g $LDFLAGS"
@@ -11,14 +11,12 @@
# make source path absolute
source_path=`cd "$source_path"; pwd`
-@@ -2995,10 +2991,6 @@
- # End of CC checks
- # After here, no more $cc or $ld runs
-
--if test "$debug" = "no" ; then
+@@ -2995,8 +2991,6 @@
+ if test "$gcov" = "yes" ; then
+ CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
+ LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
+-elif test "$debug" = "no" ; then
- CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
--fi
--
- # Disable zero malloc errors for official releases unless explicitly told to
- # enable/disable
- if test -z "$zero_malloc" ; then
+ fi
+
+
diff --git a/qemu-system-libcacard.patch b/qemu-system-libcacard.patch
index a8774bc..713bb26 100644
--- a/qemu-system-libcacard.patch
+++ b/qemu-system-libcacard.patch
@@ -4,41 +4,31 @@
#include <pk11pub.h>
int main(void) { PK11_FreeSlot(0); return 0; }
EOF
-- smartcard_includes="-I\$(SRC_PATH)/libcacard"
-- libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-- libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
-+ libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)"
-+ libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)"
-+ nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-+ nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
- test_cflags="$libcacard_cflags"
- # The header files in nss < 3.13.3 have a bug which causes them to
- # emit a warning. If we're going to compile QEMU with -Werror, then
+- smartcard_includes="-I\$(SRC_PATH)/libcacard"
+- libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
+- libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
++ libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)"
++ libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)"
++ nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
++ nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
+ test_cflags="$libcacard_cflags"
+ # The header files in nss < 3.13.3 have a bug which causes them to
+ # emit a warning. If we're going to compile QEMU with -Werror, then
@@ -2779,11 +2780,10 @@
- test_cflags="-Werror $test_cflags"
- fi
- if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \
-- compile_prog "$test_cflags" "$libcacard_libs"; then
-+ compile_prog "$test_cflags" "$nss_libs"; then
- smartcard_nss="yes"
-- QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
-- QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
-- libs_softmmu="$libcacard_libs $libs_softmmu"
-+ QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags"
-+ libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
- else
- if test "$smartcard_nss" = "yes"; then
- feature_not_found "nss"
-@@ -3133,9 +3133,6 @@
- tools="qemu-ga\$(EXESUF) $tools"
fi
- fi
-- if test "$smartcard_nss" = "yes" ; then
-- tools="vscclient\$(EXESUF) $tools"
-- fi
- fi
-
- # Mac OS X ships with a broken assembler
+ if test -n "$libtool" &&
+ $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \
+- compile_prog "$test_cflags" "$libcacard_libs"; then
++ compile_prog "$test_cflags" "$nss_libs"; then
+ smartcard_nss="yes"
+- QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
+- QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
+- libs_softmmu="$libcacard_libs $libs_softmmu"
++ QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags"
++ libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
+ else
+ if test "$smartcard_nss" = "yes"; then
+ feature_not_found "nss"
@@ -3532,6 +3529,8 @@
echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
@@ -48,28 +38,6 @@
fi
if test "$usb_redir" = "yes" ; then
-@@ -3970,9 +3969,6 @@
- if test "$target_softmmu" = "yes" ; then
- echo "CONFIG_SOFTMMU=y" >> $config_target_mak
- echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
-- if test "$smartcard_nss" = "yes" ; then
-- echo "subdir-$target: subdir-libcacard" >> $config_host_mak
-- fi
- case "$target_arch2" in
- i386|x86_64)
- echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
-@@ -4179,10 +4175,9 @@
- DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
- DIRS="$DIRS roms/seabios roms/vgabios"
- DIRS="$DIRS qapi-generated"
--DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
- FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
- FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
--FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"
-+FILES="$FILES tests/tcg/lm32/Makefile"
- FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
- FILES="$FILES pc-bios/spapr-rtas/Makefile"
- FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
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
@@ -84,64 +52,21 @@ diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/
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
-@@ -116,8 +116,6 @@
+@@ -111,9 +111,6 @@
include $(SRC_PATH)/Makefile.objs
+ include $(SRC_PATH)/tests/Makefile
endif
-
--subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
--
- subdir-pixman: pixman/Makefile
- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)
-
-@@ -166,24 +164,6 @@
- libqemustub.a: $(stub-obj-y)
-
- ######################################################################
--# Support building shared library libcacard
--
--.PHONY: libcacard.la install-libcacard
--ifeq ($(LIBTOOL),)
--libcacard.la:
-- @echo "libtool is missing, please install and rerun configure"; exit 1
--
--install-libcacard:
-- @echo "libtool is missing, please install and rerun configure"; exit 1
--else
--libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(addsuffix .lo, $(basename $(trace-obj-y)))
-- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,)
--
--install-libcacard: libcacard.la
-- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,)
+-ifeq ($(CONFIG_SMARTCARD_NSS),y)
+-include $(SRC_PATH)/libcacard/Makefile
-endif
--
--######################################################################
-
- qemu-img.o: qemu-img-cmds.h
-
-@@ -197,9 +177,6 @@
- qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
+ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
--vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a
-- $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@")
--
- fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
- fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
-
-@@ -260,7 +237,7 @@
- rm -rf qapi-generated
- rm -rf qga/qapi-generated
- $(MAKE) -C tests/tcg clean
-- for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
-+ for d in $(ALL_SUBDIRS) $(QEMULIBS); do \
- if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
- rm -f $$d/qemu-options.def; \
- done
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
-@@ -204,17 +204,6 @@
- $(trace-obj-y): $(GENERATED_HEADERS)
+@@ -34,15 +34,6 @@
+ endif
######################################################################
-# smartcard
@@ -152,9 +77,16 @@ diff -ur qemu-kvm-1.2.0/Makefile.objs qemu-kvm-1.2.0-system-libcacard/Makefile.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 @@
+
+ common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
+
-common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
-
--######################################################################
+ ######################################################################
# qapi
- qapi-obj-y = qapi/
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qemu.git/commitdiff/f8ecc2ec0a18d2d6afc25597634616890396b1db
More information about the pld-cvs-commit
mailing list