aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Danomi Manchego <danomimanchego123@gmail.com>2015-02-11 09:00:10 -0500
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-02-12 08:50:32 +0100
commitcfa6311d2a0c6dfa5e3041ef371d272a774b695f (patch)
tree31341e860b208f3ee8de623e01f66ed94ae4caf3
parentf1cdd306e28cb543714cb392931618be38c43059 (diff)
downloadbuildroot-cfa6311d2a0c6dfa5e3041ef371d272a774b695f.tar.gz
buildroot-cfa6311d2a0c6dfa5e3041ef371d272a774b695f.tar.bz2
ntp: rebase nano patch to apply cleanly
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/ntp/0001-nano.patch17
1 files 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 <gustavo@zacarias.com.ar>
-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 <danomimanchego123@gmail.com>
+
+
+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 <sys/timex.h>
#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))