All of lore.kernel.org
 help / color / mirror / Atom feed
From: yegorslists@googlemail.com
To: buildroot@buildroot.org
Cc: Bernd Kuhls <bernd@kuhls.net>
Subject: [Buildroot] [PATCH] package/ntp: remove the obsolete patch
Date: Thu,  6 Jun 2024 20:21:24 +0200	[thread overview]
Message-ID: <20240606182124.4069700-1-yegorslists@googlemail.com> (raw)

From: Yegor Yefremov <yegorslists@googlemail.com>

0001-nano.patch: both MOD_NANO and MOD_TAI were added to glibc
on 2011-03-30 in commit 83fe108b0a9bc4f2deb14695bb0c8b2011e79f28.

Renumber the remaining patches.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 .checkpackageignore                           |  3 +-
 package/ntp/0001-nano.patch                   | 28 -------------------
 ...patch => 0001-ntp-syscalls-fallback.patch} |  0
 ...ch => 0002-fix-pthread-detach-check.patch} |  0
 4 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 package/ntp/0001-nano.patch
 rename package/ntp/{0002-ntp-syscalls-fallback.patch => 0001-ntp-syscalls-fallback.patch} (100%)
 rename package/ntp/{0003-fix-pthread-detach-check.patch => 0002-fix-pthread-detach-check.patch} (100%)

diff --git a/.checkpackageignore b/.checkpackageignore
index d0bd179a5c..a7d353e7d8 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1118,8 +1118,7 @@ package/norm/0001-protolib-drop-linux-version-check.patch lib_patch.Upstream
 package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch lib_patch.Upstream
 package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch lib_patch.Upstream
 package/nss-pam-ldapd/S45nslcd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables
-package/ntp/0001-nano.patch lib_patch.Upstream
-package/ntp/0002-ntp-syscalls-fallback.patch lib_patch.Upstream
+package/ntp/0001-ntp-syscalls-fallback.patch lib_patch.Upstream
 package/ntp/S49ntp.in lib_sysv.Variables
 package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch lib_patch.Upstream
 package/numactl/0001-link-with-latomic-if-needed-again.patch lib_patch.Upstream
diff --git a/package/ntp/0001-nano.patch b/package/ntp/0001-nano.patch
deleted file mode 100644
index bce3478261..0000000000
--- a/package/ntp/0001-nano.patch
+++ /dev/null
@@ -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))
diff --git a/package/ntp/0002-ntp-syscalls-fallback.patch b/package/ntp/0001-ntp-syscalls-fallback.patch
similarity index 100%
rename from package/ntp/0002-ntp-syscalls-fallback.patch
rename to package/ntp/0001-ntp-syscalls-fallback.patch
diff --git a/package/ntp/0003-fix-pthread-detach-check.patch b/package/ntp/0002-fix-pthread-detach-check.patch
similarity index 100%
rename from package/ntp/0003-fix-pthread-detach-check.patch
rename to package/ntp/0002-fix-pthread-detach-check.patch
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2024-06-06 18:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-06 18:21 yegorslists [this message]
2024-06-06 20:23 ` [Buildroot] [PATCH] package/ntp: remove the obsolete patch Yann E. MORIN
2024-06-07  6:36   ` Yegor Yefremov
2024-06-19 20:33 ` Arnout Vandecappelle via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240606182124.4069700-1-yegorslists@googlemail.com \
    --to=yegorslists@googlemail.com \
    --cc=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.