diff options
Diffstat (limited to 'meta/recipes-extended/watchdog')
-rw-r--r-- | meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch | 32 | ||||
-rw-r--r-- | meta/recipes-extended/watchdog/watchdog_5.15.bb | 5 |
2 files changed, 35 insertions, 2 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 new file mode 100644 index 0000000000..198f198619 --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 8f91385dbd5e7c14b36ecbd8a01ca82c709f6d77 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 24 Jun 2016 18:19:29 +0000 | ||
4 | Subject: [PATCH] Include linux/param.h for EXEC_PAGESIZE definition | ||
5 | |||
6 | Musl does not include linux/param.h whereas glibc | ||
7 | does, so it fails to build on musl. | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Submitted | ||
12 | |||
13 | src/watchdog.c | 3 +++ | ||
14 | 1 file changed, 3 insertions(+) | ||
15 | |||
16 | diff --git a/src/watchdog.c b/src/watchdog.c | ||
17 | index 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 | -- | ||
31 | 1.8.3.1 | ||
32 | |||
diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb index 76a3b427c8..ee1a8933ef 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb | |||
@@ -9,8 +9,9 @@ LICENSE = "GPL-2.0+" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" |
10 | 10 | ||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ |
12 | file://watchdog-init.patch \ | 12 | file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ |
13 | file://watchdog-conf.patch \ | 13 | file://watchdog-init.patch \ |
14 | file://watchdog-conf.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI[md5sum] = "678c32f6f35a0492c9c1b76b4aa88828" | 17 | SRC_URI[md5sum] = "678c32f6f35a0492c9c1b76b4aa88828" |