summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch79
-rw-r--r--meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch19
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.7.0.bb (renamed from meta/recipes-devtools/qemu/qemu_2.6.0.bb)5
3 files changed, 11 insertions, 92 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch b/meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch
deleted file mode 100644
index c286822b21..0000000000
--- a/meta/recipes-devtools/qemu/qemu/0001-configure-support-vte-2.91.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From f40a8ceaaf0ee37fcfeb6900960632d7a7085a9f Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 17 Jun 2016 21:09:03 +0300
4Subject: [PATCH] configure: support vte-2.91
5
6Upstream-Status: Backport [c6feff9e09aa99]
7Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
8
9Original commit message below:
10
11From: Cole Robinson <crobinso@redhat.com>
12Date: Fri, 6 May 2016 14:03:12 -0400
13Subject: [PATCH] configure: support vte-2.91
14
15vte >= 0.37 expores API version 2.91, which is where all the active
16development is. qemu builds and runs fine with that version, so use it
17if it's available.
18
19Signed-off-by: Cole Robinson <crobinso@redhat.com>
20Message-id: b4f0375647f7b368d3dbd3834aee58cb0253566a.1462557436.git.crobinso@redhat.com
21Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
22---
23 configure | 17 +++++++++++------
24 1 file changed, 11 insertions(+), 6 deletions(-)
25
26diff --git a/configure b/configure
27index 54a3189..a16fa2b 100755
28--- a/configure
29+++ b/configure
30@@ -2394,20 +2394,25 @@ fi
31
32 if test "$vte" != "no"; then
33 if test "$gtkabi" = "3.0"; then
34- vtepackage="vte-2.90"
35- vteversion="0.32.0"
36+ vteminversion="0.32.0"
37+ if $pkg_config --exists "vte-2.91"; then
38+ vtepackage="vte-2.91"
39+ else
40+ vtepackage="vte-2.90"
41+ fi
42 else
43 vtepackage="vte"
44- vteversion="0.24.0"
45+ vteminversion="0.24.0"
46 fi
47- if $pkg_config --exists "$vtepackage >= $vteversion"; then
48+ if $pkg_config --exists "$vtepackage >= $vteminversion"; then
49 vte_cflags=`$pkg_config --cflags $vtepackage`
50 vte_libs=`$pkg_config --libs $vtepackage`
51+ vteversion=`$pkg_config --modversion $vtepackage`
52 libs_softmmu="$vte_libs $libs_softmmu"
53 vte="yes"
54 elif test "$vte" = "yes"; then
55 if test "$gtkabi" = "3.0"; then
56- feature_not_found "vte" "Install libvte-2.90 devel"
57+ feature_not_found "vte" "Install libvte-2.90/2.91 devel"
58 else
59 feature_not_found "vte" "Install libvte devel"
60 fi
61@@ -4759,6 +4764,7 @@ echo "pixman $pixman"
62 echo "SDL support $sdl"
63 echo "GTK support $gtk"
64 echo "GTK GL support $gtk_gl"
65+echo "VTE support $vte `echo_version $vte $vteversion`"
66 echo "GNUTLS support $gnutls"
67 echo "GNUTLS hash $gnutls_hash"
68 echo "GNUTLS rnd $gnutls_rnd"
69@@ -4771,7 +4777,6 @@ else
70 fi
71 echo "nettle kdf $nettle_kdf"
72 echo "libtasn1 $tasn1"
73-echo "VTE support $vte"
74 echo "curses support $curses"
75 echo "virgl support $virglrenderer"
76 echo "curl support $curl"
77--
782.1.4
79
diff --git a/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch b/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch
index a99f72098c..2ce3478e4a 100644
--- a/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch
+++ b/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch
@@ -4,14 +4,14 @@ Add subpackage -ptest which runs all unit test cases for qemu.
4 4
5Signed-off-by: Kai Kang <kai.kang@windriver.com> 5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6--- 6---
7 tests/Makefile | 10 ++++++++++ 7 tests/Makefile.include | 8 ++++++++
8 1 file changed, 10 insertions(+) 8 1 file changed, 8 insertions(+)
9 9
10diff --git a/tests/Makefile b/tests/Makefile 10diff --git a/tests/Makefile.include b/tests/Makefile.include
11index 88f7105..3f40b4b 100644 11index 14be491..0fce37a 100644
12--- a/tests/Makefile 12--- a/tests/Makefile.include
13+++ b/tests/Makefile 13+++ b/tests/Makefile.include
14@@ -405,3 +405,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) 14@@ -776,3 +776,11 @@ all: $(QEMU_IOTESTS_HELPERS-y)
15 15
16 -include $(wildcard tests/*.d) 16 -include $(wildcard tests/*.d)
17 -include $(wildcard tests/libqos/*.d) 17 -include $(wildcard tests/libqos/*.d)
@@ -23,7 +23,6 @@ index 88f7105..3f40b4b 100644
23+ nf=$$(echo $$f | sed 's/tests\//\.\//g'); \ 23+ nf=$$(echo $$f | sed 's/tests\//\.\//g'); \
24+ $$nf; \ 24+ $$nf; \
25+ done 25+ done
26+ 26--
27-- 272.9.0
281.7.9.5
29 28
diff --git a/meta/recipes-devtools/qemu/qemu_2.6.0.bb b/meta/recipes-devtools/qemu/qemu_2.7.0.bb
index c4a04359a7..619b8ed449 100644
--- a/meta/recipes-devtools/qemu/qemu_2.6.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.7.0.bb
@@ -9,12 +9,11 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
9 file://no-valgrind.patch \ 9 file://no-valgrind.patch \
10 file://pathlimit.patch \ 10 file://pathlimit.patch \
11 file://qemu-2.5.0-cflags.patch \ 11 file://qemu-2.5.0-cflags.patch \
12 file://0001-configure-support-vte-2.91.patch \
13" 12"
14 13
15SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 14SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
16SRC_URI[md5sum] = "ca3f70b43f093e33e9e014f144067f13" 15SRC_URI[md5sum] = "08d4d06d1cb598efecd796137f4844ab"
17SRC_URI[sha256sum] = "c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec" 16SRC_URI[sha256sum] = "326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53"
18 17
19COMPATIBLE_HOST_class-target_mips64 = "null" 18COMPATIBLE_HOST_class-target_mips64 = "null"
20 19