From cfa6311d2a0c6dfa5e3041ef371d272a774b695f Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Wed, 11 Feb 2015 09:00:10 -0500 Subject: [PATCH] ntp: rebase nano patch to apply cleanly Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/ntp/0001-nano.patch | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/package/ntp/0001-nano.patch b/package/ntp/0001-nano.patch index d16046cb03..bce3478261 100644 --- a/package/ntp/0001-nano.patch +++ b/package/ntp/0001-nano.patch @@ -3,10 +3,15 @@ http://bugs.gentoo.org/show_bug.cgi?id=270483 Signed-off-by: Gustavo Zacarias -diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscall.h ---- ntp-4.2.6p2.orig/include/ntp_syscall.h 2009-12-09 04:36:37.000000000 -0300 -+++ ntp-4.2.6p2/include/ntp_syscall.h 2011-01-27 13:09:05.072336628 -0300 -@@ -14,6 +14,14 @@ +Rebase to apply cleanly. + +Signed-off-by: Danomi Manchego + + +diff -purN a/include/ntp_syscall.h b/include/ntp_syscall.h +--- a/include/ntp_syscall.h 2015-02-11 08:42:37.794576469 -0500 ++++ b/include/ntp_syscall.h 2015-02-11 08:43:03.216957279 -0500 +@@ -10,6 +10,14 @@ # include #endif @@ -19,5 +24,5 @@ diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscal +#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)) -- 2.30.2