diff options
| author | Khem Raj <raj.khem@gmail.com> | 2021-04-12 23:48:41 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-30 14:37:25 +0100 |
| commit | f5d3d43422bf6526b7a624cb67b30392b056dd5c (patch) | |
| tree | 341ab4bd6790697d0f1edf98e94b4ee282982cac | |
| parent | c135ee79f6c9c5b571a2b0f5133712e8de134fd2 (diff) | |
| download | poky-f5d3d43422bf6526b7a624cb67b30392b056dd5c.tar.gz | |
systemd: Fix build on mips/musl
(From OE-Core rev: 84f452be1f6a4d1de276553815899c79a1f2cf63)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b4a0d8799af0a3d1b685dd7200b545fdb2c79d64)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_247.4.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch new file mode 100644 index 0000000000..bbee6e6b28 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From 7b32582c066549fea0f7180a6c575e7fa37a867f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 12 Apr 2021 23:44:53 -0700 | ||
| 4 | Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl | ||
| 5 | |||
| 6 | musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64 | ||
| 7 | unlike glibc where these are provided by libc headers, therefore define | ||
| 8 | them here in case they are undefined | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | src/basic/missing_syscall.h | 6 ++++++ | ||
| 15 | 1 file changed, 6 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h | ||
| 18 | index 0594a1b930..495d161334 100644 | ||
| 19 | --- a/src/basic/missing_syscall.h | ||
| 20 | +++ b/src/basic/missing_syscall.h | ||
| 21 | @@ -15,6 +15,12 @@ | ||
| 22 | #include <asm/sgidefs.h> | ||
| 23 | #endif | ||
| 24 | |||
| 25 | +#ifndef _MIPS_SIM_ABI32 | ||
| 26 | +#define _MIPS_SIM_ABI32 1 | ||
| 27 | +#define _MIPS_SIM_NABI32 2 | ||
| 28 | +#define _MIPS_SIM_ABI64 3 | ||
| 29 | +#endif | ||
| 30 | + | ||
| 31 | #if defined(__x86_64__) && defined(__ILP32__) | ||
| 32 | # define systemd_SC_arch_bias(x) ((x) | /* __X32_SYSCALL_BIT */ 0x40000000) | ||
| 33 | #elif defined(__ia64__) | ||
| 34 | -- | ||
| 35 | 2.31.1 | ||
| 36 | |||
diff --git a/meta/recipes-core/systemd/systemd_247.4.bb b/meta/recipes-core/systemd/systemd_247.4.bb index cd67e65abe..32afa159ec 100644 --- a/meta/recipes-core/systemd/systemd_247.4.bb +++ b/meta/recipes-core/systemd/systemd_247.4.bb | |||
| @@ -55,6 +55,7 @@ SRC_URI_MUSL = "\ | |||
| 55 | file://0022-do-not-disable-buffer-in-writing-files.patch \ | 55 | file://0022-do-not-disable-buffer-in-writing-files.patch \ |
| 56 | file://0025-Handle-__cpu_mask-usage.patch \ | 56 | file://0025-Handle-__cpu_mask-usage.patch \ |
| 57 | file://0026-Handle-missing-gshadow.patch \ | 57 | file://0026-Handle-missing-gshadow.patch \ |
| 58 | file://0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ | ||
| 58 | " | 59 | " |
| 59 | 60 | ||
| 60 | PAM_PLUGINS = " \ | 61 | PAM_PLUGINS = " \ |
