summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-03-17 10:05:32 +0000
committerArmin Kuster <akuster808@gmail.com>2018-03-17 19:33:38 -0700
commit9a623e54f53efb50ebeeea207a029e0db88cad61 (patch)
treeb2dd3c5abda0e899fb13bd0b7eb93ec2f007518d
parent9cf45d0f3b2131fee056cb3d050dfdf93e334907 (diff)
downloadmeta-openembedded-stagging/master-next.tar.gz
ntp: refresh patchstagging/master-next
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 <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> 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 <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch20
1 files 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 @@
1--- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 1From 2310898533f059d875dcffd26ab6cf1b280292fd Mon Sep 17 00:00:00 2001
2+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 2From: Koen Kooi <koen@dominion.thruhere.net>
3@@ -14,6 +14,14 @@ 3Date: Wed, 12 Jan 2011 21:38:46 +0100
4
5---
6 include/ntp_syscall.h | 8 ++++++++
7 1 file changed, 8 insertions(+)
8
9diff --git a/include/ntp_syscall.h b/include/ntp_syscall.h
10index d1ce03e..9e18432 100644
11--- a/include/ntp_syscall.h
12+++ b/include/ntp_syscall.h
13@@ -10,6 +10,14 @@
4 # include <sys/timex.h> 14 # include <sys/timex.h>
5 #endif 15 #endif
6 16
@@ -13,5 +23,5 @@
13+#endif 23+#endif
14+ 24+
15 #ifndef NTP_SYSCALLS_LIBC 25 #ifndef NTP_SYSCALLS_LIBC
16 #ifdef NTP_SYSCALLS_STD 26 # ifdef NTP_SYSCALLS_STD
17 # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) 27 # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))