diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-06-24 11:47:02 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-01 16:08:47 +0100 |
| commit | f6f531e7795dceefa8a42246cb9ed4efbffca2dd (patch) | |
| tree | 2092e9c6bf15a224df5a1d384eaa7ee95b767d76 /meta | |
| parent | 42487843f846ae61f8bd1b2278d148ff37f0d667 (diff) | |
| download | openembedded-core-f6f531e7795dceefa8a42246cb9ed4efbffca2dd.tar.gz openembedded-core-f6f531e7795dceefa8a42246cb9ed4efbffca2dd.tar.bz2 openembedded-core-f6f531e7795dceefa8a42246cb9ed4efbffca2dd.zip | |
watchdog: Fix build with musl
A similar patch has been submitted upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -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 @@ +From 8f91385dbd5e7c14b36ecbd8a01ca82c709f6d77 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 24 Jun 2016 18:19:29 +0000 +Subject: [PATCH] Include linux/param.h for EXEC_PAGESIZE definition + +Musl does not include linux/param.h whereas glibc +does, so it fails to build on musl. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + src/watchdog.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/watchdog.c b/src/watchdog.c +index acf6450..486384a 100644 +--- a/src/watchdog.c ++++ b/src/watchdog.c +@@ -26,6 +26,9 @@ + #include <sys/param.h> /* For EXEC_PAGESIZE */ + #include <linux/oom.h> + #include <linux/watchdog.h> ++#ifdef __linux__ ++#include <linux/param.h> ++#endif + #include <string.h> + + #include <libgen.h> +-- +1.8.3.1 + 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ - file://watchdog-init.patch \ - file://watchdog-conf.patch \ + file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ + file://watchdog-init.patch \ + file://watchdog-conf.patch \ " SRC_URI[md5sum] = "678c32f6f35a0492c9c1b76b4aa88828" |