diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2021-03-13 13:50:31 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2021-03-17 09:39:50 -0400 |
commit | b78b413a24cf97f5ebda73bcf36fcb15ffbe1abf (patch) | |
tree | a94331d8e45daadf00799dabee73a0c6f6ce2c66 /recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch | |
parent | d10900fc87b7ac7758b15b275659b8a6e1042397 (diff) | |
download | meta-selinux-b78b413a24cf97f5ebda73bcf36fcb15ffbe1abf.tar.gz |
libselinux: update to 3.2
* Merge inc file into bb file.
* Drop obsolete patches:
0001-libselinux-do-not-define-gettid-for-musl.patch
libselinux-define-FD_CLOEXEC-as-necessary.patch
libselinux-make-O_CLOEXEC-optional.patch
libselinux-make-SOCK_CLOEXEC-optional.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
Diffstat (limited to 'recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch')
-rw-r--r-- | recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch b/recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch deleted file mode 100644 index 5d6e409..0000000 --- a/recipes-security/selinux/libselinux/0001-libselinux-do-not-define-gettid-for-musl.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 5f6f4a095bc82b29c3871d4d8a15d9c16cef39ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Wed, 6 Jan 2021 10:42:11 +0800 | ||
4 | Subject: [PATCH] libselinux: do not define gettid() for musl | ||
5 | |||
6 | The musl has implemented gettid() function: | ||
7 | http://git.musl-libc.org/cgit/musl/commit/?id=d49cf07541bb54a5ac7aec1feec8514db33db8ea | ||
8 | |||
9 | Fixes: | ||
10 | procattr.c:38:14: error: static declaration of 'gettid' follows non-static declaration | ||
11 | 38 | static pid_t gettid(void) | ||
12 | | ^~~~~~ | ||
13 | In file included from procattr.c:2: | ||
14 | /build/tmp/work/core2-32-poky-linux-musl/libselinux/3.1-r0/recipe-sysroot/usr/include/unistd.h:194:7: | ||
15 | note: previous declaration of 'gettid' was here | ||
16 | 194 | pid_t gettid(void); | ||
17 | | ^~~~~~ | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
22 | --- | ||
23 | src/procattr.c | 8 +------- | ||
24 | 1 file changed, 1 insertion(+), 7 deletions(-) | ||
25 | |||
26 | diff --git a/src/procattr.c b/src/procattr.c | ||
27 | index 926ee54..519e515 100644 | ||
28 | --- a/src/procattr.c | ||
29 | +++ b/src/procattr.c | ||
30 | @@ -24,13 +24,7 @@ static __thread char destructor_initialized; | ||
31 | |||
32 | /* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and | ||
33 | * has a definition for it */ | ||
34 | -#ifdef __BIONIC__ | ||
35 | - #define OVERRIDE_GETTID 0 | ||
36 | -#elif !defined(__GLIBC_PREREQ) | ||
37 | - #define OVERRIDE_GETTID 1 | ||
38 | -#elif !__GLIBC_PREREQ(2,30) | ||
39 | - #define OVERRIDE_GETTID 1 | ||
40 | -#else | ||
41 | +#if !defined(__GLIBC_) | ||
42 | #define OVERRIDE_GETTID 0 | ||
43 | #endif | ||
44 | |||
45 | -- | ||
46 | 2.17.1 | ||
47 | |||