summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2021-12-16 03:48:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-20 15:29:01 +0000
commited5d621cbaba83ffcce88609b83da218200e0ab3 (patch)
tree5306d7ef09f7699d8592b4397b7e524e4dbf6774 /meta/recipes-devtools
parent94b371e1c9e3cea787d70d6d7a09f7d3d69a30aa (diff)
downloadpoky-ed5d621cbaba83ffcce88609b83da218200e0ab3.tar.gz
qemu: add patch to set minimum kernel version for riscv32
which enables us to drop the -r option on qemu-static-riscv32 invocations. (From OE-Core rev: 4552249810ed27d1272130226d054e7651a90ce6) Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch40
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index fe35f94acf..584c9482e9 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -27,6 +27,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
27 file://determinism.patch \ 27 file://determinism.patch \
28 file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ 28 file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \
29 file://0001-linux-user-Replace-__u64-with-uint64_t.patch \ 29 file://0001-linux-user-Replace-__u64-with-uint64_t.patch \
30 file://0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch \
30 " 31 "
31UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 32UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
32 33
diff --git a/meta/recipes-devtools/qemu/qemu/0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch b/meta/recipes-devtools/qemu/qemu/0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch
new file mode 100644
index 0000000000..ac4b6dcc44
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch
@@ -0,0 +1,40 @@
1From 359dc12eb32b2395cf10796157002024e6a58054 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Dec 2021 23:31:11 -0800
4Subject: [PATCH] riscv: Set 5.4 as minimum kernel version for riscv32
5
65.4 is first stable API as far as rv32 is concerned see [1]
7
8[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=7a55dd3fb6d2c307a002a16776be84310b9c8989
9
10Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/2021-12/msg02495.html]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Cc: Palmer Dabbelt <palmer@dabbelt.com>
14Cc: Alistair Francis <alistair.francis@wdc.com>
15Cc: Bin Meng <bin.meng@windriver.com>
16Signed-off-by: Matt Madison <matt@madison.systems>
17---
18 linux-user/riscv/target_syscall.h | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/linux-user/riscv/target_syscall.h b/linux-user/riscv/target_syscall.h
22index dc597c897..9b1316132 100644
23--- a/linux-user/riscv/target_syscall.h
24+++ b/linux-user/riscv/target_syscall.h
25@@ -45,10 +45,11 @@ struct target_pt_regs {
26
27 #ifdef TARGET_RISCV32
28 #define UNAME_MACHINE "riscv32"
29+#define UNAME_MINIMUM_RELEASE "5.4.0"
30 #else
31 #define UNAME_MACHINE "riscv64"
32-#endif
33 #define UNAME_MINIMUM_RELEASE "4.15.0"
34+#endif
35
36 #define TARGET_MINSIGSTKSZ 2048
37 #define TARGET_MCL_CURRENT 1
38--
392.32.0
40