summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/watchdog/watchdog
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-05-14 23:29:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-15 16:31:44 +0100
commit7e1b054aed1ed221e1359c5da6a36eea67daadf2 (patch)
tree0f108ba75c024433db5f6468c69623aa6bf35121 /meta/recipes-extended/watchdog/watchdog
parentff2a3335c432b6d031caf16d6b07e62f0743b9a3 (diff)
downloadpoky-7e1b054aed1ed221e1359c5da6a36eea67daadf2.tar.gz
watchdog: upgrade 5.15 -> 5.16
0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch removed since it is included in 5.16 -License-Update: Copyright year updated to 2020. (From OE-Core rev: 1ec6381bb6b654076ee7eec1d3a8933a160b7811) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/watchdog/watchdog')
-rw-r--r--meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch b/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
deleted file mode 100644
index 198f198619..0000000000
--- a/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 8f91385dbd5e7c14b36ecbd8a01ca82c709f6d77 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 24 Jun 2016 18:19:29 +0000
4Subject: [PATCH] Include linux/param.h for EXEC_PAGESIZE definition
5
6Musl does not include linux/param.h whereas glibc
7does, so it fails to build on musl.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12
13 src/watchdog.c | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/src/watchdog.c b/src/watchdog.c
17index acf6450..486384a 100644
18--- a/src/watchdog.c
19+++ b/src/watchdog.c
20@@ -26,6 +26,9 @@
21 #include <sys/param.h> /* For EXEC_PAGESIZE */
22 #include <linux/oom.h>
23 #include <linux/watchdog.h>
24+#ifdef __linux__
25+#include <linux/param.h>
26+#endif
27 #include <string.h>
28
29 #include <libgen.h>
30--
311.8.3.1
32