diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-05-09 14:42:04 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-11 08:27:27 -0700 |
commit | af43242a22861e9fc110d97cc4e06fed0be4325e (patch) | |
tree | 057a115e8da404453504673f933ec36b1678bd03 /meta-oe/recipes-kernel | |
parent | 61bf4cdf50ada3de86a6191e44232a7ec7e0b3d5 (diff) | |
download | meta-openembedded-af43242a22861e9fc110d97cc4e06fed0be4325e.tar.gz |
minicoredumper: Replace pthread_mutexattr_setrobust_np with pthread_mutexattr_setrobust
Remove unused patch 0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel')
3 files changed, 34 insertions, 29 deletions
diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch deleted file mode 100644 index ad255fae0..000000000 --- a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 6181d9c3c407ee030b4c3a94045318b9e3a3cc89 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Jul 2017 14:08:54 -0700 | ||
4 | Subject: [PATCH] minicoredumper: Initialize pointer to config struct to null | ||
5 | |||
6 | Fixes | ||
7 | corestripper.c:3632:13: error: variable 'cfg' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | src/minicoredumper/corestripper.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c | ||
15 | index a764073..ddb0d25 100644 | ||
16 | --- a/src/minicoredumper/corestripper.c | ||
17 | +++ b/src/minicoredumper/corestripper.c | ||
18 | @@ -3605,7 +3605,7 @@ out: | ||
19 | |||
20 | static int do_all_dumps(struct dump_info *di, int argc, char *argv[]) | ||
21 | { | ||
22 | - struct config *cfg; | ||
23 | + struct config *cfg = 0; | ||
24 | const char *recept; | ||
25 | bool live_dumper; | ||
26 | char *comm_base; | ||
27 | -- | ||
28 | 2.13.3 | ||
29 | |||
diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch new file mode 100644 index 000000000..455e6f318 --- /dev/null +++ b/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 5895caba6573e84f73f159d9e84cd1aa7e969f18 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 9 May 2021 14:37:00 -0700 | ||
4 | Subject: [PATCH] replace pthread_mutexattr_setrobust_np with | ||
5 | pthread_mutexattr_setrobust | ||
6 | |||
7 | This is now part of standard POSIX function [1] | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/diamon/minicoredumper/pull/3] | ||
10 | |||
11 | [1] https://man7.org/linux/man-pages/man3/pthread_mutexattr_setrobust_np.3.html | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/minicoredumper_regd/daemon.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/minicoredumper_regd/daemon.c b/src/minicoredumper_regd/daemon.c | ||
19 | index 115ec92..b9ad1ea 100644 | ||
20 | --- a/src/minicoredumper_regd/daemon.c | ||
21 | +++ b/src/minicoredumper_regd/daemon.c | ||
22 | @@ -224,7 +224,7 @@ static int setup_shm(void) | ||
23 | |||
24 | pthread_mutexattr_init(&attr); | ||
25 | pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); | ||
26 | - pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); | ||
27 | + pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST); | ||
28 | pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); | ||
29 | pthread_mutex_init(&sh->m, &attr); | ||
30 | |||
31 | -- | ||
32 | 2.31.1 | ||
33 | |||
diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index d381c83ae..6a04e7891 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb | |||
@@ -14,6 +14,7 @@ SRCREV = "16a0d44f1725eaa93096eaa0e086f42ef4c2712c" | |||
14 | PR .= "+git${SRCPV}" | 14 | PR .= "+git${SRCPV}" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \ | 16 | SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \ |
17 | file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \ | ||
17 | file://minicoredumper.service \ | 18 | file://minicoredumper.service \ |
18 | file://minicoredumper.init \ | 19 | file://minicoredumper.init \ |
19 | " | 20 | " |