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 ad255fae06..0000000000 --- a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6181d9c3c407ee030b4c3a94045318b9e3a3cc89 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 25 Jul 2017 14:08:54 -0700 -Subject: [PATCH] minicoredumper: Initialize pointer to config struct to null - -Fixes -corestripper.c:3632:13: error: variable 'cfg' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/minicoredumper/corestripper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c -index a764073..ddb0d25 100644 ---- a/src/minicoredumper/corestripper.c -+++ b/src/minicoredumper/corestripper.c -@@ -3605,7 +3605,7 @@ out: - - static int do_all_dumps(struct dump_info *di, int argc, char *argv[]) - { -- struct config *cfg; -+ struct config *cfg = 0; - const char *recept; - bool live_dumper; - char *comm_base; --- -2.13.3 - 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 0000000000..455e6f3181 --- /dev/null +++ b/meta-oe/recipes-kernel/minicoredumper/files/0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch @@ -0,0 +1,33 @@ +From 5895caba6573e84f73f159d9e84cd1aa7e969f18 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 9 May 2021 14:37:00 -0700 +Subject: [PATCH] replace pthread_mutexattr_setrobust_np with + pthread_mutexattr_setrobust + +This is now part of standard POSIX function [1] + +Upstream-Status: Submitted [https://github.com/diamon/minicoredumper/pull/3] + +[1] https://man7.org/linux/man-pages/man3/pthread_mutexattr_setrobust_np.3.html + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/minicoredumper_regd/daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/minicoredumper_regd/daemon.c b/src/minicoredumper_regd/daemon.c +index 115ec92..b9ad1ea 100644 +--- a/src/minicoredumper_regd/daemon.c ++++ b/src/minicoredumper_regd/daemon.c +@@ -224,7 +224,7 @@ static int setup_shm(void) + + pthread_mutexattr_init(&attr); + pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); +- pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP); ++ pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST); + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + pthread_mutex_init(&sh->m, &attr); + +-- +2.31.1 + 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 d381c83ae8..6a04e78919 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" PR .= "+git${SRCPV}" SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \ + file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \ file://minicoredumper.service \ file://minicoredumper.init \ " |