diff options
-rw-r--r-- | meta/recipes-core/musl/musl/0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 3 |
2 files changed, 1 insertions, 34 deletions
diff --git a/meta/recipes-core/musl/musl/0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch b/meta/recipes-core/musl/musl/0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch deleted file mode 100644 index 9d9f16cee6..0000000000 --- a/meta/recipes-core/musl/musl/0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 40732d03990632049d5ba63dd736269a81756b16 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 19 May 2021 00:30:05 -0700 | ||
4 | Subject: [PATCH] riscv: Rename __NR_fstatat __NR_newfstatat | ||
5 | |||
6 | on riscv64 this syscall is called __NR_newfstatat | ||
7 | this helps the name match kernel UAPI for external | ||
8 | programs | ||
9 | |||
10 | Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2021/05/19/3] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | Cc: zabolcs Nagy <nsz@port70.net> | ||
13 | --- | ||
14 | arch/riscv64/bits/syscall.h.in | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/arch/riscv64/bits/syscall.h.in b/arch/riscv64/bits/syscall.h.in | ||
18 | index f9c421d0..39c0d650 100644 | ||
19 | --- a/arch/riscv64/bits/syscall.h.in | ||
20 | +++ b/arch/riscv64/bits/syscall.h.in | ||
21 | @@ -76,7 +76,7 @@ | ||
22 | #define __NR_splice 76 | ||
23 | #define __NR_tee 77 | ||
24 | #define __NR_readlinkat 78 | ||
25 | -#define __NR_fstatat 79 | ||
26 | +#define __NR_newfstatat 79 | ||
27 | #define __NR_fstat 80 | ||
28 | #define __NR_sync 81 | ||
29 | #define __NR_fsync 82 | ||
30 | -- | ||
31 | 2.31.1 | ||
32 | |||
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index f9c174d9c1..06b0e060d0 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | require musl.inc | 4 | require musl.inc |
5 | inherit linuxloader | 5 | inherit linuxloader |
6 | 6 | ||
7 | SRCREV = "aad50fcd791e009961621ddfbe3d4c245fd689a3" | 7 | SRCREV = "3f701faace7addc75d16dea8a6cd769fa5b3f260" |
8 | 8 | ||
9 | BASEVER = "1.2.2" | 9 | BASEVER = "1.2.2" |
10 | 10 | ||
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}" | |||
15 | SRC_URI = "git://git.musl-libc.org/musl \ | 15 | SRC_URI = "git://git.musl-libc.org/musl \ |
16 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ | 16 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ |
17 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ | 17 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ |
18 | file://0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |