Преглед изворни кода

package/ntp: remove the obsolete patch

0001-nano.patch: both MOD_NANO and MOD_TAI were added to glibc 2.12
on 2011-03-30 in commit 83fe108b0a9bc4f2deb14695bb0c8b2011e79f28.
They were added to musl 0.7.5 in commit f5ba2bc9c on 2011-03-18. And
they were added to uClibc 1.0.23 in commit 2d8ea0524b on 2017-03-17. We
consider all of these old enough to assume they always exist.

Renumber the remaining patches.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit eee73d0cc0a9fe9373ad72851276a528e5e829da)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yegor Yefremov пре 1 година
родитељ
комит
484e033624

+ 1 - 2
.checkpackageignore

@@ -889,8 +889,7 @@ package/norm/0001-protolib-drop-linux-version-check.patch Upstream
 package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch Upstream
 package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch Upstream
 package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables
-package/ntp/0001-nano.patch Upstream
-package/ntp/0002-ntp-syscalls-fallback.patch Upstream
+package/ntp/0001-ntp-syscalls-fallback.patch Upstream
 package/ntp/S49ntp.in Variables
 package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch Upstream
 package/numactl/0001-link-with-latomic-if-needed-again.patch Upstream

+ 0 - 28
package/ntp/0001-nano.patch

@@ -1,28 +0,0 @@
-Fixes issues with glibc header files, see
-http://bugs.gentoo.org/show_bug.cgi?id=270483
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-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
- 
-+#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))

+ 0 - 0
package/ntp/0002-ntp-syscalls-fallback.patch → package/ntp/0001-ntp-syscalls-fallback.patch


+ 0 - 0
package/ntp/0003-fix-pthread-detach-check.patch → package/ntp/0002-fix-pthread-detach-check.patch