diff options
author | Stuart Yoder <stuart.yoder@freescale.com> | 2014-04-08 18:11:38 -0500 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2014-07-08 18:14:47 +0800 |
commit | 21a1969332a77bb65c2f4de1d9fcd3f16d7cebca (patch) | |
tree | 9a4fc81d489ddbe74090079345e3ca148ee4398c /recipes-devtools/qemu | |
parent | b3ee31b313acf8e00d2bac4f57a16887ac9f03f0 (diff) | |
download | meta-fsl-ppc-21a1969332a77bb65c2f4de1d9fcd3f16d7cebca.tar.gz |
qemu: update to QEMU 1.7
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
Diffstat (limited to 'recipes-devtools/qemu')
8 files changed, 4 insertions, 459 deletions
diff --git a/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch b/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch deleted file mode 100644 index 30daf29..0000000 --- a/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch +++ /dev/null | |||
@@ -1,201 +0,0 @@ | |||
1 | From 9a7146ca91c04d05af36684d8b3ca79c1254abc2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Armbruster <armbru@redhat.com> | ||
3 | Date: Wed, 13 Feb 2013 19:49:40 +0100 | ||
4 | Subject: [PATCH 1/2] doc: Fix texinfo @table markup in qemu-options.hx | ||
5 | |||
6 | End tables before headings, start new ones afterwards. Fixes | ||
7 | incorrect indentation of headings "File system options" and "Virtual | ||
8 | File system pass-through options" in manual page and qemu-doc. | ||
9 | |||
10 | Normalize markup some to increase chances it survives future edits. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | Signed-off-by: Markus Armbruster <armbru@redhat.com> | ||
16 | Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
17 | Message-id: 1360781383-28635-5-git-send-email-armbru@redhat.com | ||
18 | Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> | ||
19 | --- | ||
20 | qemu-options.hx | 56 +++++++++++++++++++++++++++++++++++++------------------- | ||
21 | 1 file changed, 37 insertions(+), 19 deletions(-) | ||
22 | |||
23 | diff --git a/qemu-options.hx b/qemu-options.hx | ||
24 | index 9d7131a..54bd92a 100644 | ||
25 | --- a/qemu-options.hx | ||
26 | +++ b/qemu-options.hx | ||
27 | @@ -537,13 +537,15 @@ STEXI | ||
28 | @end table | ||
29 | ETEXI | ||
30 | |||
31 | -DEF("usb", 0, QEMU_OPTION_usb, | ||
32 | - "-usb enable the USB driver (will be the default soon)\n", | ||
33 | - QEMU_ARCH_ALL) | ||
34 | STEXI | ||
35 | USB options: | ||
36 | @table @option | ||
37 | +ETEXI | ||
38 | |||
39 | +DEF("usb", 0, QEMU_OPTION_usb, | ||
40 | + "-usb enable the USB driver (will be the default soon)\n", | ||
41 | + QEMU_ARCH_ALL) | ||
42 | +STEXI | ||
43 | @item -usb | ||
44 | @findex -usb | ||
45 | Enable the USB driver (will be the default soon) | ||
46 | @@ -610,9 +612,15 @@ possible drivers and properties, use @code{-device help} and | ||
47 | @code{-device @var{driver},help}. | ||
48 | ETEXI | ||
49 | |||
50 | +STEXI | ||
51 | +@end table | ||
52 | +ETEXI | ||
53 | DEFHEADING() | ||
54 | |||
55 | DEFHEADING(File system options:) | ||
56 | +STEXI | ||
57 | +@table @option | ||
58 | +ETEXI | ||
59 | |||
60 | DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev, | ||
61 | "-fsdev fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}]\n" | ||
62 | @@ -676,9 +684,15 @@ Specifies the tag name to be used by the guest to mount this export point | ||
63 | |||
64 | ETEXI | ||
65 | |||
66 | +STEXI | ||
67 | +@end table | ||
68 | +ETEXI | ||
69 | DEFHEADING() | ||
70 | |||
71 | DEFHEADING(Virtual File system pass-through options:) | ||
72 | +STEXI | ||
73 | +@table @option | ||
74 | +ETEXI | ||
75 | |||
76 | DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs, | ||
77 | "-virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none]\n" | ||
78 | @@ -769,11 +783,9 @@ ETEXI | ||
79 | STEXI | ||
80 | @end table | ||
81 | ETEXI | ||
82 | - | ||
83 | DEFHEADING() | ||
84 | |||
85 | DEFHEADING(Display options:) | ||
86 | - | ||
87 | STEXI | ||
88 | @table @option | ||
89 | ETEXI | ||
90 | @@ -1215,7 +1227,6 @@ ETEXI | ||
91 | STEXI | ||
92 | @end table | ||
93 | ETEXI | ||
94 | - | ||
95 | ARCHHEADING(, QEMU_ARCH_I386) | ||
96 | |||
97 | ARCHHEADING(i386 target only:, QEMU_ARCH_I386) | ||
98 | @@ -1301,10 +1312,10 @@ Specify SMBIOS type 0 fields | ||
99 | Specify SMBIOS type 1 fields | ||
100 | ETEXI | ||
101 | |||
102 | -DEFHEADING() | ||
103 | STEXI | ||
104 | @end table | ||
105 | ETEXI | ||
106 | +DEFHEADING() | ||
107 | |||
108 | DEFHEADING(Network options:) | ||
109 | STEXI | ||
110 | @@ -1718,13 +1729,19 @@ libpcap, so it can be analyzed with tools such as tcpdump or Wireshark. | ||
111 | Indicate that no network devices should be configured. It is used to | ||
112 | override the default configuration (@option{-net nic -net user}) which | ||
113 | is activated if no @option{-net} options are provided. | ||
114 | +ETEXI | ||
115 | |||
116 | +STEXI | ||
117 | @end table | ||
118 | ETEXI | ||
119 | - | ||
120 | DEFHEADING() | ||
121 | |||
122 | DEFHEADING(Character device options:) | ||
123 | +STEXI | ||
124 | + | ||
125 | +The general form of a character device option is: | ||
126 | +@table @option | ||
127 | +ETEXI | ||
128 | |||
129 | DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, | ||
130 | "-chardev null,id=id[,mux=on|off]\n" | ||
131 | @@ -1766,10 +1783,6 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, | ||
132 | ) | ||
133 | |||
134 | STEXI | ||
135 | - | ||
136 | -The general form of a character device option is: | ||
137 | -@table @option | ||
138 | - | ||
139 | @item -chardev @var{backend} ,id=@var{id} [,mux=on|off] [,@var{options}] | ||
140 | @findex -chardev | ||
141 | Backend is one of: | ||
142 | @@ -1990,14 +2003,15 @@ Connect to a spice virtual machine channel, such as vdiport. | ||
143 | |||
144 | Connect to a spice port, allowing a Spice client to handle the traffic | ||
145 | identified by a name (preferably a fqdn). | ||
146 | +ETEXI | ||
147 | |||
148 | +STEXI | ||
149 | @end table | ||
150 | ETEXI | ||
151 | - | ||
152 | DEFHEADING() | ||
153 | |||
154 | -STEXI | ||
155 | DEFHEADING(Device URL Syntax:) | ||
156 | +STEXI | ||
157 | |||
158 | In addition to using normal file images for the emulated storage devices, | ||
159 | QEMU can also use networked resources such as iSCSI devices. These are | ||
160 | @@ -2113,10 +2127,16 @@ qemu-system-x86_84 --drive file=gluster://192.0.2.1/testvol/a.img | ||
161 | @end example | ||
162 | |||
163 | See also @url{http://www.gluster.org}. | ||
164 | +ETEXI | ||
165 | + | ||
166 | +STEXI | ||
167 | @end table | ||
168 | ETEXI | ||
169 | |||
170 | DEFHEADING(Bluetooth(R) options:) | ||
171 | +STEXI | ||
172 | +@table @option | ||
173 | +ETEXI | ||
174 | |||
175 | DEF("bt", HAS_ARG, QEMU_OPTION_bt, \ | ||
176 | "-bt hci,null dumb bluetooth HCI - doesn't respond to commands\n" \ | ||
177 | @@ -2130,8 +2150,6 @@ DEF("bt", HAS_ARG, QEMU_OPTION_bt, \ | ||
178 | " emulate a bluetooth device 'dev' in scatternet 'n'\n", | ||
179 | QEMU_ARCH_ALL) | ||
180 | STEXI | ||
181 | -@table @option | ||
182 | - | ||
183 | @item -bt hci[...] | ||
184 | @findex -bt | ||
185 | Defines the function of the corresponding Bluetooth HCI. -bt options | ||
186 | @@ -2183,9 +2201,11 @@ currently: | ||
187 | @item keyboard | ||
188 | Virtual wireless keyboard implementing the HIDP bluetooth profile. | ||
189 | @end table | ||
190 | -@end table | ||
191 | ETEXI | ||
192 | |||
193 | +STEXI | ||
194 | +@end table | ||
195 | +ETEXI | ||
196 | DEFHEADING() | ||
197 | |||
198 | DEFHEADING(Linux/Multiboot boot specific:) | ||
199 | -- | ||
200 | 1.8.1.5 | ||
201 | |||
diff --git a/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch b/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch deleted file mode 100644 index cabbf0e..0000000 --- a/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From f983d4978e1c49ee936ad52bf2de0c531420f5f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Cole Robinson <crobinso@redhat.com> | ||
3 | Date: Wed, 20 Feb 2013 07:20:31 +0000 | ||
4 | Subject: [PATCH 2/2] docs: Fix generating qemu-doc.html with texinfo 5 | ||
5 | |||
6 | LC_ALL=C makeinfo --no-headers --no-split --number-sections --html qemu-doc.texi -o qemu-doc.html | ||
7 | ./qemu-options.texi:1521: unknown command `list' | ||
8 | ./qemu-options.texi:1521: table requires an argument: the formatter for @item | ||
9 | ./qemu-options.texi:1521: warning: @table has text but no @item | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | http://patchwork.ozlabs.org/patch/222131/ | ||
13 | |||
14 | CC: qemu-stable@nongnu.org | ||
15 | Signed-off-by: Cole Robinson <crobinso@redhat.com> | ||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
17 | Reviewed-by: Markus Armbruster <armbru@redhat.com> | ||
18 | --- | ||
19 | qemu-options.hx | 19 +++++++------------ | ||
20 | 1 file changed, 7 insertions(+), 12 deletions(-) | ||
21 | |||
22 | diff --git a/qemu-options.hx b/qemu-options.hx | ||
23 | index 54bd92a..5d2d9b8 100644 | ||
24 | --- a/qemu-options.hx | ||
25 | +++ b/qemu-options.hx | ||
26 | @@ -2089,18 +2089,13 @@ QEMU supports using either local sheepdog devices or remote networked | ||
27 | devices. | ||
28 | |||
29 | Syntax for specifying a sheepdog device | ||
30 | -@table @list | ||
31 | -``sheepdog:<vdiname>'' | ||
32 | - | ||
33 | -``sheepdog:<vdiname>:<snapid>'' | ||
34 | - | ||
35 | -``sheepdog:<vdiname>:<tag>'' | ||
36 | - | ||
37 | -``sheepdog:<host>:<port>:<vdiname>'' | ||
38 | - | ||
39 | -``sheepdog:<host>:<port>:<vdiname>:<snapid>'' | ||
40 | - | ||
41 | -``sheepdog:<host>:<port>:<vdiname>:<tag>'' | ||
42 | +@table @code | ||
43 | +@item sheepdog:<vdiname> | ||
44 | +@item sheepdog:<vdiname>:<snapid> | ||
45 | +@item sheepdog:<vdiname>:<tag> | ||
46 | +@item sheepdog:<host>:<port>:<vdiname> | ||
47 | +@item sheepdog:<host>:<port>:<vdiname>:<snapid> | ||
48 | +@item sheepdog:<host>:<port>:<vdiname>:<tag> | ||
49 | @end table | ||
50 | |||
51 | Example | ||
52 | -- | ||
53 | 1.8.1.5 | ||
54 | |||
diff --git a/recipes-devtools/qemu/files/add-gtk-options.patch b/recipes-devtools/qemu/files/add-gtk-options.patch deleted file mode 100644 index d8522de..0000000 --- a/recipes-devtools/qemu/files/add-gtk-options.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | --- a/configure.old 2013-12-11 21:24:44.422276752 -0600 | ||
2 | +++ b/configure 2013-12-11 21:27:26.954335983 -0600 | ||
3 | @@ -897,6 +897,10 @@ | ||
4 | ;; | ||
5 | --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes" | ||
6 | ;; | ||
7 | + --disable-gtk) gtk="no" | ||
8 | + ;; | ||
9 | + --enable-gtk) gtk="yes" | ||
10 | + ;; | ||
11 | *) echo "ERROR: unknown option $opt"; show_help="yes" | ||
12 | ;; | ||
13 | esac | ||
diff --git a/recipes-devtools/qemu/files/add-libssh2-options.patch b/recipes-devtools/qemu/files/add-libssh2-options.patch deleted file mode 100644 index 07b9350..0000000 --- a/recipes-devtools/qemu/files/add-libssh2-options.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Freescale qemu configure do not include libssh2 options. | ||
4 | In order to configure pass , dummy libssh2 options is added to | ||
5 | freescale qemu configure | ||
6 | |||
7 | Signed-off-by: Chunrong Guo <b40290@freescale.com> | ||
8 | |||
9 | |||
10 | --- a/configure.old 2014-05-26 12:08:09.000000000 +0800 | ||
11 | +++ b/configure 2014-05-26 12:10:23.000000000 +0800 | ||
12 | @@ -897,6 +897,10 @@ | ||
13 | ;; | ||
14 | --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes" | ||
15 | ;; | ||
16 | + --disable-libssh2) libssh2="no" | ||
17 | + ;; | ||
18 | + --enable-libssh2) libssh2="yes" | ||
19 | + ;; | ||
20 | --disable-gtk) gtk="no" | ||
21 | ;; | ||
22 | --enable-gtk) gtk="yes" | ||
diff --git a/recipes-devtools/qemu/files/fdt_header.patch b/recipes-devtools/qemu/files/fdt_header.patch deleted file mode 100644 index dccfe53..0000000 --- a/recipes-devtools/qemu/files/fdt_header.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | qemu: define fdt types in libfdt_env.h from qemu | ||
4 | |||
5 | * fixes | ||
6 | In file included from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/libfdt.h:55:0, | ||
7 | from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/work/x86_64-linux/qemu-native/1.4.0-r0/qemu-1.4.0/hw/arm/../../device_tree.c:28: | ||
8 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:58:2: error: unknown type name 'fdt32_t' | ||
9 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:59:2: error: unknown type name 'fdt32_t' | ||
10 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:60:2: error: unknown type name 'fdt32_t' | ||
11 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:61:2: error: unknown type name 'fdt32_t' | ||
12 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:62:2: error: unknown type name 'fdt32_t' | ||
13 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:63:2: error: unknown type name 'fdt32_t' | ||
14 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:64:2: error: unknown type name 'fdt32_t' | ||
15 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:67:2: error: unknown type name 'fdt32_t' | ||
16 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:70:2: error: unknown type name 'fdt32_t' | ||
17 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:73:2: error: unknown type name 'fdt32_t' | ||
18 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:77:2: error: unknown type name 'fdt64_t' | ||
19 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:78:2: error: unknown type name 'fdt64_t' | ||
20 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:82:2: error: unknown type name 'fdt32_t' | ||
21 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:87:2: error: unknown type name 'fdt32_t' | ||
22 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:88:2: error: unknown type name 'fdt32_t' | ||
23 | /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:89:2: error: unknown type name 'fdt32_t' | ||
24 | |||
25 | Index: qemu-1.4.0/include/libfdt_env.h | ||
26 | =================================================================== | ||
27 | --- qemu-1.4.0.orig/include/libfdt_env.h 2013-02-15 23:05:35.000000000 +0000 | ||
28 | +++ qemu-1.4.0/include/libfdt_env.h 2013-04-13 14:17:27.918885225 +0000 | ||
29 | @@ -21,6 +21,10 @@ | ||
30 | |||
31 | #include "qemu/bswap.h" | ||
32 | |||
33 | +typedef uint16_t fdt16_t; | ||
34 | +typedef uint32_t fdt32_t; | ||
35 | +typedef uint64_t fdt64_t; | ||
36 | + | ||
37 | #ifdef HOST_WORDS_BIGENDIAN | ||
38 | #define fdt32_to_cpu(x) (x) | ||
39 | #define cpu_to_fdt32(x) (x) | ||
diff --git a/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch b/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch deleted file mode 100644 index 13a6ea2..0000000 --- a/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | fix libcap header issue on some distro | ||
2 | |||
3 | 1, When build qemu-native on SLED 11.2, there is an error: | ||
4 | ... | ||
5 | | In file included from /usr/include/bits/sigcontext.h:28, | ||
6 | | from /usr/include/signal.h:339, | ||
7 | | from /buildarea2/tmp/work/i686-linux/qemu-native/1.4.0-r0/ | ||
8 | qemu-1.4.0/include/qemu-common.h:42, | ||
9 | | from fsdev/virtfs-proxy-helper.c:23: | ||
10 | | /usr/include/asm/sigcontext.h:28: error: expected specifier- | ||
11 | qualifier-list before '__u64' | ||
12 | | /usr/include/asm/sigcontext.h:191: error: expected specifier- | ||
13 | qualifier-list before '__u64' | ||
14 | ... | ||
15 | |||
16 | 2, The virtfs-proxy-helper.c includes <sys/capability.h> and | ||
17 | qemu-common.h in sequence. The header include map is: | ||
18 | (`-->' presents `include') | ||
19 | ... | ||
20 | "virtfs-proxy-helper.c" --> <sys/capability.h> | ||
21 | ... | ||
22 | "virtfs-proxy-helper.c" --> "qemu-common.h" --> <signal.h> --> | ||
23 | <bits/sigcontext.h> --> <asm/sigcontext.h> --> <linux/types.h> --> | ||
24 | <asm/types.h> --> <asm-generic/types.h> --> <asm-generic/int-ll64.h> | ||
25 | ... | ||
26 | |||
27 | 3, The bug is found on SLED 11.2 x86. In libcap header file | ||
28 | /usr/include/sys/capability.h, it does evil stuff like this: | ||
29 | ... | ||
30 | 25 /* | ||
31 | 26 * Make sure we can be included from userland by preventing | ||
32 | 27 * capability.h from including other kernel headers | ||
33 | 28 */ | ||
34 | 29 #define _LINUX_TYPES_H | ||
35 | 30 #define _LINUX_FS_H | ||
36 | 31 #define __LINUX_COMPILER_H | ||
37 | 32 #define __user | ||
38 | 33 | ||
39 | 34 typedef unsigned int __u32; | ||
40 | 35 typedef __u32 __le32; | ||
41 | ... | ||
42 | This completely prevents including /usr/include/linux/types.h. | ||
43 | The above `<asm/sigcontext.h> --> <linux/types.h>' is prevented, | ||
44 | and '__u64' is defined in <asm-generic/int-ll64.h>. | ||
45 | |||
46 | 4, Modify virtfs-proxy-helper.c to include <sys/capability.h> | ||
47 | last to workaround the issue. | ||
48 | |||
49 | http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html | ||
50 | http://patchwork.linuxtv.org/patch/12748/ | ||
51 | |||
52 | Upstream-Status: Pending | ||
53 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
54 | --- | ||
55 | fsdev/virtfs-proxy-helper.c | 7 +++++-- | ||
56 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
57 | |||
58 | diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c | ||
59 | --- a/fsdev/virtfs-proxy-helper.c | ||
60 | +++ b/fsdev/virtfs-proxy-helper.c | ||
61 | @@ -12,7 +12,6 @@ | ||
62 | #include <sys/resource.h> | ||
63 | #include <getopt.h> | ||
64 | #include <syslog.h> | ||
65 | -#include <sys/capability.h> | ||
66 | #include <sys/fsuid.h> | ||
67 | #include <sys/vfs.h> | ||
68 | #include <sys/ioctl.h> | ||
69 | @@ -26,7 +25,11 @@ | ||
70 | #include "virtio-9p-marshal.h" | ||
71 | #include "hw/9pfs/virtio-9p-proxy.h" | ||
72 | #include "fsdev/virtio-9p-marshal.h" | ||
73 | - | ||
74 | +/* | ||
75 | + * Include this one last due to some versions of it being buggy: | ||
76 | + * http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html | ||
77 | + */ | ||
78 | +#include <sys/capability.h> | ||
79 | #define PROGNAME "virtfs-proxy-helper" | ||
80 | |||
81 | #ifndef XFS_SUPER_MAGIC | ||
82 | -- | ||
83 | 1.7.10.4 | ||
84 | |||
diff --git a/recipes-devtools/qemu/files/relocatable_sdk.patch b/recipes-devtools/qemu/files/relocatable_sdk.patch deleted file mode 100644 index 774a49c..0000000 --- a/recipes-devtools/qemu/files/relocatable_sdk.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [SDK specific] | ||
2 | |||
3 | In order to be able to change the dynamic loader path when relocating | ||
4 | binaries, the interp section has to be made big enough to accomodate | ||
5 | the new path (4096 is the maximum path length in Linux). | ||
6 | |||
7 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
8 | |||
9 | Index: qemu-1.4.0/ldscripts/i386.ld | ||
10 | =================================================================== | ||
11 | --- qemu-1.4.0.orig/ldscripts/i386.ld 2013-02-15 15:05:35.000000000 -0800 | ||
12 | +++ qemu-1.4.0/ldscripts/i386.ld 2013-02-28 22:55:36.138816418 -0800 | ||
13 | @@ -8,7 +8,7 @@ | ||
14 | { | ||
15 | /* Read-only sections, merged into text segment: */ | ||
16 | . = 0x60000000 + SIZEOF_HEADERS; | ||
17 | - .interp : { *(.interp) } | ||
18 | + .interp : { *(.interp); . = 0x1000; } | ||
19 | .hash : { *(.hash) } | ||
20 | .dynsym : { *(.dynsym) } | ||
21 | .dynstr : { *(.dynstr) } | ||
22 | Index: qemu-1.4.0/ldscripts/x86_64.ld | ||
23 | =================================================================== | ||
24 | --- qemu-1.4.0.orig/ldscripts/x86_64.ld 2013-02-15 15:05:35.000000000 -0800 | ||
25 | +++ qemu-1.4.0/ldscripts/x86_64.ld 2013-02-28 22:55:36.138816418 -0800 | ||
26 | @@ -6,7 +6,7 @@ | ||
27 | { | ||
28 | /* Read-only sections, merged into text segment: */ | ||
29 | . = 0x60000000 + SIZEOF_HEADERS; | ||
30 | - .interp : { *(.interp) } | ||
31 | + .interp : { *(.interp); . = 0x1000; } | ||
32 | .hash : { *(.hash) } | ||
33 | .dynsym : { *(.dynsym) } | ||
34 | .dynstr : { *(.dynstr) } | ||
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb index eab3db5..e76f350 100644 --- a/recipes-devtools/qemu/qemu_fslgit.bb +++ b/recipes-devtools/qemu/qemu_fslgit.bb | |||
@@ -3,24 +3,16 @@ require recipes-devtools/qemu/qemu.inc | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ |
4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" | 4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" |
5 | 5 | ||
6 | # This means v1.4 with FSL specific patches applied | 6 | # This means QEMU v1.7 with FSL specific patches applied |
7 | PV = "1.4+fsl" | 7 | PV = "1.7+fsl" |
8 | 8 | ||
9 | SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1" | 9 | SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1" |
10 | SRCREV = "99231018edf75522aea2630e4089c9163566fb73" | 10 | SRCREV = "9e38e640275beabf6468a04cec5c403b2ac566ad" |
11 | |||
12 | SRC_URI += " \ | ||
13 | file://0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch \ | ||
14 | file://0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch \ | ||
15 | file://fdt_header.patch \ | ||
16 | file://add-gtk-options.patch \ | ||
17 | file://add-libssh2-options.patch \ | ||
18 | " | ||
19 | 11 | ||
20 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
21 | 13 | ||
22 | QEMU_TARGETS = "ppc" | 14 | QEMU_TARGETS = "ppc" |
23 | PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --audio-drv-list="" --audio-card-list="" --disable-bluez --disable-curl' | 15 | PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl --enable-libusb' |
24 | EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}" | 16 | EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}" |
25 | EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}" | 17 | EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}" |
26 | EXTRA_OECONF_e6500 = "--target-list=ppc64-softmmu ${PPC_OECONF}" | 18 | EXTRA_OECONF_e6500 = "--target-list=ppc64-softmmu ${PPC_OECONF}" |