summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu/find_datadir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/find_datadir.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu/find_datadir.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/find_datadir.patch b/meta/recipes-devtools/qemu/qemu/find_datadir.patch
index 74e9ba56ce..9a4c11267a 100644
--- a/meta/recipes-devtools/qemu/qemu/find_datadir.patch
+++ b/meta/recipes-devtools/qemu/qemu/find_datadir.patch
@@ -9,8 +9,10 @@ Upstream-Status: Submitted [qemu-devel@nongnu.org]
9Signed-off-by: Joe Slater <joe.slater@windriver.com> 9Signed-off-by: Joe Slater <joe.slater@windriver.com>
10 10
11 11
12--- a/os-posix.c 12Index: qemu-5.1.0/os-posix.c
13+++ b/os-posix.c 13===================================================================
14--- qemu-5.1.0.orig/os-posix.c
15+++ qemu-5.1.0/os-posix.c
14@@ -82,8 +82,9 @@ void os_setup_signal_handling(void) 16@@ -82,8 +82,9 @@ void os_setup_signal_handling(void)
15 17
16 /* 18 /*
@@ -19,10 +21,10 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
19 * When running from the build tree this will be "$bindir/../pc-bios". 21 * When running from the build tree this will be "$bindir/../pc-bios".
20- * Otherwise, this is CONFIG_QEMU_DATADIR. 22- * Otherwise, this is CONFIG_QEMU_DATADIR.
21+ * Otherwise, this is CONFIG_QEMU_DATADIR as constructed by configure. 23+ * Otherwise, this is CONFIG_QEMU_DATADIR as constructed by configure.
22 */ 24 *
23 char *os_find_datadir(void) 25 * The caller must use g_free() to free the returned data when it is
24 { 26 * no longer required.
25@@ -93,6 +94,12 @@ char *os_find_datadir(void) 27@@ -96,6 +97,12 @@ char *os_find_datadir(void)
26 exec_dir = qemu_get_exec_dir(); 28 exec_dir = qemu_get_exec_dir();
27 g_return_val_if_fail(exec_dir != NULL, NULL); 29 g_return_val_if_fail(exec_dir != NULL, NULL);
28 30