diff options
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch | 34 |
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 | " |
| 33 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 34 | UPSTREAM_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 @@ | |||
| 1 | From a4bdc0416134477e4eae386db04b1de7491163bb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Thu, 14 Jan 2021 06:33:04 +0000 | ||
| 4 | Subject: [PATCH] tests/meson.build: use relative path to refer to files | ||
| 5 | |||
| 6 | Fix error like: | ||
| 7 | Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long | ||
| 8 | |||
| 9 | when build path is too long, use meson.source_root() will make this | ||
| 10 | filename too long. Fixed by using relative path to refer to files | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [send to qemu-devel] | ||
| 13 | |||
| 14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 15 | --- | ||
| 16 | tests/meson.build | 2 +- | ||
| 17 | 1 files changed, 1 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/tests/meson.build b/tests/meson.build | ||
| 20 | index 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 | -- | ||
| 33 | 2.29.2 | ||
| 34 | |||
