From 9a623e54f53efb50ebeeea207a029e0db88cad61 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 17 Mar 2018 10:05:32 +0000 Subject: ntp: refresh patch WARNING: ntp-4.2.8p10-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify devtool finish --force-patch-refresh Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch ntp-4.2.4_p6-nano.patch patching file include/ntp_syscall.h Hunk #1 succeeded at 10 with fuzz 2 (offset -4 lines). Now at patch ntp-4.2.4_p6-nano.patch Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- .../recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch index cb1e2f734..d45b7e38b 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch +++ b/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch @@ -1,6 +1,16 @@ ---- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 -+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 -@@ -14,6 +14,14 @@ +From 2310898533f059d875dcffd26ab6cf1b280292fd Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Wed, 12 Jan 2011 21:38:46 +0100 + +--- + include/ntp_syscall.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/include/ntp_syscall.h b/include/ntp_syscall.h +index d1ce03e..9e18432 100644 +--- a/include/ntp_syscall.h ++++ b/include/ntp_syscall.h +@@ -10,6 +10,14 @@ # include #endif @@ -13,5 +23,5 @@ +#endif + #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) + # ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) -- cgit v1.2.3-54-g00ecf