* [Buildroot] [PATCH] package/ntp: remove the obsolete patch
@ 2024-06-06 18:21 yegorslists
2024-06-06 20:23 ` Yann E. MORIN
2024-06-19 20:33 ` Arnout Vandecappelle via buildroot
0 siblings, 2 replies; 4+ messages in thread
From: yegorslists @ 2024-06-06 18:21 UTC (permalink / raw)
To: buildroot; +Cc: Bernd Kuhls
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH] package/ntp: remove the obsolete patch 2024-06-06 18:21 [Buildroot] [PATCH] package/ntp: remove the obsolete patch yegorslists @ 2024-06-06 20:23 ` Yann E. MORIN 2024-06-07 6:36 ` Yegor Yefremov 2024-06-19 20:33 ` Arnout Vandecappelle via buildroot 1 sibling, 1 reply; 4+ messages in thread From: Yann E. MORIN @ 2024-06-06 20:23 UTC (permalink / raw) To: yegorslists; +Cc: Bernd Kuhls, buildroot Yegor, All, On 2024-06-06 20:21 +0200, yegorslists@googlemail.com spake thusly: > 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. It would have been good to state what glibc version first had that commit. It was glibc 2.14, released 2011-05-31 (funny, we also recently decided to assume that host would ahve at least glibc 3.14 ;-) ). However, in 83fe108b0a9bc4f2deb14695bb0c8b2011e79f28, I only notice that both MOD_NANO and MOD_TAI are actually _removed_: --- a/sysdeps/unix/sysv/linux/sys/timex.h +++ b/sysdeps/unix/sysv/linux/sys/timex.h ... +#include <bits/timex.h> ... -#define MOD_MICRO ADJ_MICRO -#define MOD_NANO ADJ_NANO So, technically, it _had_ both even before that. And bits/timex.h was introduced in the same commit, as a copy-with-diff from sys/timex.h. For musl, they were both added in f5ba2bc9c, also 2011-03-18, first released as 0.7.5. For uclibc, they both were added in 2d8ea0524b, 2017-03-17, first released as 1.0.23. So, do we consider that uclibc 1.0.23 is old enough that they are guaranteed to exist, or do we still want to keep them just in case? Regards, Yann E. MORIN. > 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 -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/ntp: remove the obsolete patch 2024-06-06 20:23 ` Yann E. MORIN @ 2024-06-07 6:36 ` Yegor Yefremov 0 siblings, 0 replies; 4+ messages in thread From: Yegor Yefremov @ 2024-06-07 6:36 UTC (permalink / raw) To: Yann E. MORIN; +Cc: Bernd Kuhls, buildroot Yann, All, On Thu, Jun 6, 2024 at 10:23 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > Yegor, All, > > On 2024-06-06 20:21 +0200, yegorslists@googlemail.com spake thusly: > > 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. > > It would have been good to state what glibc version first had that > commit. It was glibc 2.14, released 2011-05-31 (funny, we also recently > decided to assume that host would ahve at least glibc 3.14 ;-) ). > > However, in 83fe108b0a9bc4f2deb14695bb0c8b2011e79f28, I only notice that > both MOD_NANO and MOD_TAI are actually _removed_: > > --- a/sysdeps/unix/sysv/linux/sys/timex.h > +++ b/sysdeps/unix/sysv/linux/sys/timex.h > ... > +#include <bits/timex.h> > ... > -#define MOD_MICRO ADJ_MICRO > -#define MOD_NANO ADJ_NANO > > So, technically, it _had_ both even before that. And bits/timex.h was > introduced in the same commit, as a copy-with-diff from sys/timex.h. You're right, the original commit for MOD_TAI and MOD_NANO is 89b432d7a5befb85048c97e881b2106e8df58e43 i.e. glibc 2.12. > For musl, they were both added in f5ba2bc9c, also 2011-03-18, first > released as 0.7.5. > > For uclibc, they both were added in 2d8ea0524b, 2017-03-17, first > released as 1.0.23. > > So, do we consider that uclibc 1.0.23 is old enough that they are > guaranteed to exist, or do we still want to keep them just in case? I don't use uclibc and hence cannot judge about this. Is version 1.0.23 feature-rich enough for the latest BR? Yegor > > 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 > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] package/ntp: remove the obsolete patch 2024-06-06 18:21 [Buildroot] [PATCH] package/ntp: remove the obsolete patch yegorslists 2024-06-06 20:23 ` Yann E. MORIN @ 2024-06-19 20:33 ` Arnout Vandecappelle via buildroot 1 sibling, 0 replies; 4+ messages in thread From: Arnout Vandecappelle via buildroot @ 2024-06-19 20:33 UTC (permalink / raw) To: yegorslists, buildroot; +Cc: Bernd Kuhls On 06/06/2024 20:21, yegorslists@googlemail.com wrote: > 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> Applied to master with an extended commit log containing all the research Yann did, thanks. Regards, Arnout > --- > .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 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-19 20:33 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-06-06 18:21 [Buildroot] [PATCH] package/ntp: remove the obsolete patch yegorslists 2024-06-06 20:23 ` Yann E. MORIN 2024-06-07 6:36 ` Yegor Yefremov 2024-06-19 20:33 ` Arnout Vandecappelle via buildroot
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.