summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2021-01-14 15:53:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-16 22:39:35 +0000
commit2e4c20d4cc7a7116bb9495c3cb802d13de31c017 (patch)
treefc53bbcdd4b4fb2187f213bc480cc2fb7c2b2ef6 /meta
parent90288f32db96da5aa7635ca430fe7cb98737c8f5 (diff)
downloadpoky-2e4c20d4cc7a7116bb9495c3cb802d13de31c017.tar.gz
qemu: fix do_compile error
Fix error like: Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long (From OE-Core rev: e125430dea6e5eba5587f56602b006c90ab16509) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index cfa65f99d0..c894b81b10 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -29,6 +29,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
29 file://mingwfix.patch \ 29 file://mingwfix.patch \
30 file://mmap.patch \ 30 file://mmap.patch \
31 file://mmap2.patch \ 31 file://mmap2.patch \
32 file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \
32 " 33 "
33UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 34UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
34 35
diff --git a/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch
new file mode 100644
index 0000000000..5cb5757c37
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch
@@ -0,0 +1,34 @@
1From a4bdc0416134477e4eae386db04b1de7491163bb Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 14 Jan 2021 06:33:04 +0000
4Subject: [PATCH] tests/meson.build: use relative path to refer to files
5
6Fix error like:
7Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long
8
9when build path is too long, use meson.source_root() will make this
10filename too long. Fixed by using relative path to refer to files
11
12Upstream-Status: Submitted [send to qemu-devel]
13
14Signed-off-by: Changqing Li <changqing.li@windriver.com>
15---
16 tests/meson.build | 2 +-
17 1 files changed, 1 insertions(+), 1 deletion(-)
18
19diff --git a/tests/meson.build b/tests/meson.build
20index afeb6be..54684b5 100644
21--- a/tests/meson.build
22+++ b/tests/meson.build
23@@ -113,7 +113,7 @@ tests = {
24 'test-keyval': [testqapi],
25 'test-logging': [],
26 'test-uuid': [],
27- 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'],
28+ 'ptimer-test': ['ptimer-test-stubs.c', '../hw/core/ptimer.c'],
29 'test-qapi-util': [],
30 }
31
32--
332.29.2
34