mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-05 08:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: upgrade 5.15 -> 5.16

Browse Source 
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>
This commit is contained in:
Wang Mingyu
2020-05-14 23:29:13 +08:00
committed by Richard Purdie
parent ff2a3335c4
commit 7e1b054aed
2 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
View File

@@ -1,32 +0,0 @@
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

7
meta/recipes-extended/watchdog/watchdog_5.15.bb → meta/recipes-extended/watchdog/watchdog_5.16.bb
View File

@@ -6,17 +6,16 @@ HOMEPAGE = "http://watchdog.sourceforge.net/"
BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194"
LICENSE = "GPL-2.0+"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
LIC_FILES_CHKSUM = "file://COPYING;md5=084236108b1d4a9851bf5213fea586fd"
SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \
file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \
file://watchdog.init \
file://wd_keepalive.init \
"
SRC_URI[md5sum] = "678c32f6f35a0492c9c1b76b4aa88828"
SRC_URI[sha256sum] = "ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c"
SRC_URI[md5sum] = "1b4f51cabc64d1bee2fce7cdd626831f"
SRC_URI[sha256sum] = "b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/"
UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/"