diff options
| author | kroeckx <kroeckx@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-06-03 19:47:34 +0000 |
|---|---|---|
| committer | kroeckx <kroeckx@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-06-03 19:47:34 +0000 |
| commit | 08230a4dc214396e8a26a15477f4028f4f5634fc (patch) | |
| tree | dd36494c97847649e532fb7ff7aab26762b45112 | |
| parent | 3493733373933e08832a81f2be9962ef78ee9119 (diff) | |
| download | ntp-08230a4dc214396e8a26a15477f4028f4f5634fc.tar.gz | |
drop mod_nano.patch
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@329 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/mod_nano.patch | 20 |
2 files changed, 1 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index 2b3b208..684b3f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low * Drop nanokernel-status.patch. 2.6.26 was part of lenny, so everybody really should have nanokernel support now. The patch also didn't actually enable the nano kernel. + * Drop mod_nano.patch, libc now provides the proper defines. -- Kurt Roeckx <kurt@roeckx.be> Fri, 03 Jun 2011 16:39:02 +0200 diff --git a/debian/patches/mod_nano.patch b/debian/patches/mod_nano.patch deleted file mode 100644 index 150e5b3..0000000 --- a/debian/patches/mod_nano.patch +++ /dev/null @@ -1,20 +0,0 @@ -bug #552882 -patch adapted from http://cvs.fedoraproject.org/viewvc/devel/ntp/ntp-4.2.4p7-nano.patch?revision=1.1&view=markup - ---- a/include/ntp_syscall.h -+++ b/include/ntp_syscall.h -@@ -14,6 +14,14 @@ - # include <sys/timex.h> - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) |