From 9547f3517523ad8d8046dec4fef4993c5d3ec07a Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Tue, 22 Jul 2025 11:12:27 +0800 Subject: chrony: upgrade 4.6.1 -> 4.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: ========== - Add opencommands directive to select remote monitoring commands - Add interval option to driftfile directive - Add waitsynced and waitunsynced options to local directive - Add sanity checks for integer values in configuration - Add support for systemd Type=notify service - Add RTC refclock driver - Allow PHC refclock to be specified with network interface name - Don’t require multiple refclock samples per poll to simplify filter configuration - Keep refclock reachable when dropping samples with large delay - Improve quantile-based filtering to adapt faster to larger delay - Improve logging of selection failures - Detect clock interference from other processes - Try to reopen message log (-l option) on cyclelogs command - Fix sourcedir reloading to not multiply sources - Fix tracking offset after failed clock step - Drop support for NTS with Nettle < 3.6 and GnuTLS < 3.6.14 - Drop support for building without POSIX threads Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- .../recipes-support/chrony/chrony/arm_eabi.patch | 17 ++- .../recipes-support/chrony/chrony_4.6.1.bb | 141 --------------------- .../recipes-support/chrony/chrony_4.7.bb | 141 +++++++++++++++++++++ 3 files changed, 149 insertions(+), 150 deletions(-) delete mode 100644 meta-networking/recipes-support/chrony/chrony_4.6.1.bb create mode 100644 meta-networking/recipes-support/chrony/chrony_4.7.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index b9bb374e53..07bb044c6d 100644 --- a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -1,4 +1,4 @@ -From 71c44c214c0ab8dc8e9675e5e862f2e342fcb271 Mon Sep 17 00:00:00 2001 +From 7df907871b87772072abc94aeff2b7ba770e8f44 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 9 Mar 2017 10:58:06 -0800 Subject: [PATCH] chrony: fix build failure for arma9 @@ -22,16 +22,15 @@ Signed-off-by: Robert Joslyn Refreshed for 4.0 Signed-off-by: Khem Raj - --- sys_linux.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys_linux.c b/sys_linux.c -index 6849637..10f9a57 100644 +index 8373e25..47b4459 100644 --- a/sys_linux.c +++ b/sys_linux.c -@@ -485,7 +485,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) +@@ -490,7 +490,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) #endif SCMP_SYS(gettimeofday), SCMP_SYS(settimeofday), @@ -39,7 +38,7 @@ index 6849637..10f9a57 100644 /* Process */ SCMP_SYS(clone), -@@ -495,7 +494,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) +@@ -500,7 +499,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid), @@ -47,7 +46,7 @@ index 6849637..10f9a57 100644 SCMP_SYS(getuid), SCMP_SYS(getuid32), #ifdef __NR_membarrier -@@ -515,7 +513,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) +@@ -520,7 +518,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) /* Memory */ SCMP_SYS(brk), SCMP_SYS(madvise), @@ -55,7 +54,7 @@ index 6849637..10f9a57 100644 SCMP_SYS(mmap2), SCMP_SYS(mprotect), SCMP_SYS(mremap), -@@ -575,8 +572,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) +@@ -580,8 +577,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) SCMP_SYS(sendmsg), SCMP_SYS(sendto), SCMP_SYS(shutdown), @@ -64,7 +63,7 @@ index 6849637..10f9a57 100644 /* General I/O */ SCMP_SYS(_newselect), -@@ -600,7 +595,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) +@@ -605,7 +600,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) #ifdef __NR_futex_time64 SCMP_SYS(futex_time64), #endif @@ -72,7 +71,7 @@ index 6849637..10f9a57 100644 SCMP_SYS(set_robust_list), SCMP_SYS(write), SCMP_SYS(writev), -@@ -609,6 +603,15 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) +@@ -614,6 +608,15 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), diff --git a/meta-networking/recipes-support/chrony/chrony_4.6.1.bb b/meta-networking/recipes-support/chrony/chrony_4.6.1.bb deleted file mode 100644 index 5ac3e6d37e..0000000000 --- a/meta-networking/recipes-support/chrony/chrony_4.6.1.bb +++ /dev/null @@ -1,141 +0,0 @@ -SUMMARY = "Versatile implementation of the Network Time Protocol" -DESCRIPTION = "Chrony can synchronize the system clock with NTP \ -servers, reference clocks (e.g. GPS receiver), and manual input using \ -wristwatch and keyboard. It can also operate as an NTPv4 (RFC 5905) \ -server and peer to provide a time service to other computers in the \ -network. \ -\ -It is designed to perform well in a wide range of conditions, \ -including intermittent network connections, heavily congested \ -networks, changing temperatures (ordinary computer clocks are \ -sensitive to temperature), and systems that do not run continuously, or \ -run on a virtual machine. \ -\ -Typical accuracy between two machines on a LAN is in tens, or a few \ -hundreds, of microseconds; over the Internet, accuracy is typically \ -within a few milliseconds. With a good hardware reference clock \ -sub-microsecond accuracy is possible. \ -\ -Two programs are included in chrony: chronyd is a daemon that can be \ -started at boot time and chronyc is a command-line interface program \ -which can be used to monitor chronyd's performance and to change \ -various operating parameters whilst it is running. \ -\ -This recipe produces two binary packages: 'chrony' which contains chronyd, \ -the configuration file and the init script, and 'chronyc' which contains \ -the client program only." - -HOMEPAGE = "https://chrony.tuxfamily.org/" -SECTION = "net" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "https://chrony-project.org/releases/chrony-${PV}.tar.gz \ - file://chrony.conf \ - file://chronyd \ - file://arm_eabi.patch \ -" - -SRC_URI:append:libc-musl = " \ - file://0001-Fix-compilation-with-musl.patch \ -" -SRC_URI[sha256sum] = "571ff73fbf0ae3097f0604eca2e00b1d8bb2e91affe1a3494785ff21d6199c5c" - -DEPENDS = "pps-tools" - -# Note: Despite being built via './configure; make; make install', -# chrony does not use GNU Autotools. -inherit update-rc.d systemd pkgconfig - -# Add chronyd user if privdrop packageconfig is selected -inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} -USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" -USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /sbin/nologin chronyd;', '', d)}" - -# Configuration options: -# - Security-related: -# - 'sechash' is omitted by default because it pulls in nss which is huge. -# - 'privdrop' allows chronyd to run as non-root; would need changes to -# chrony.conf and init script. -# - 'scfilter' enables support for system call filtering, but requires the -# kernel to have CONFIG_SECCOMP enabled. -PACKAGECONFIG ??= "editline \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -" -PACKAGECONFIG[editline] = ",--without-editline,libedit" -PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" -PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" -PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp" -PACKAGECONFIG[ipv6] = ",--disable-ipv6," -PACKAGECONFIG[nts] = ",--disable-nts,gnutls" - -# --disable-static isn't supported by chrony's configure script. -DISABLE_STATIC = "" - -do_configure() { - ./configure --sysconfdir=${sysconfdir} --bindir=${bindir} --sbindir=${sbindir} \ - --localstatedir=${localstatedir} --datarootdir=${datadir} \ - --with-ntp-era=$(shell date -d '1970-01-01 00:00:00+00:00' +'%s') \ - --with-pidfile=/run/chrony/chronyd.pid \ - --chronyrundir=/run/chrony \ - --host-system=Linux \ - ${PACKAGECONFIG_CONFARGS} -} - -do_install() { - # Binaries - install -d ${D}${bindir} - install -m 0755 ${S}/chronyc ${D}${bindir} - install -d ${D}${sbindir} - install -m 0755 ${S}/chronyd ${D}${sbindir} - - # Config file - install -d ${D}${sysconfdir} - install -m 644 ${UNPACKDIR}/chrony.conf ${D}${sysconfdir} - if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then - echo "# Define user to drop to after dropping root privileges" >> ${D}${sysconfdir}/chrony.conf - echo "user chronyd" >> ${D}${sysconfdir}/chrony.conf - fi - - # System V init script - install -d ${D}${sysconfdir}/init.d - install -m 755 ${UNPACKDIR}/chronyd ${D}${sysconfdir}/init.d - - # systemd unit configuration file - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/examples/chronyd.service ${D}${systemd_unitdir}/system/ - - # Variable data (for drift and/or rtc file) - install -d ${D}${localstatedir}/lib/chrony - - # Fix hard-coded paths in config files and init scripts - sed -i -e 's!/var/!${localstatedir}/!g' -e 's!/etc/!${sysconfdir}/!g' \ - -e 's!/usr/sbin/!${sbindir}/!g' -e 's!/usr/bin/!${bindir}/!g' \ - ${D}${sysconfdir}/chrony.conf \ - ${D}${sysconfdir}/init.d/chronyd \ - ${D}${systemd_unitdir}/system/chronyd.service - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/chronyd - sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service - - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/lib/chrony 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/chronyd.conf - -} - -FILES:${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}" -CONFFILES:${PN} = "${sysconfdir}/chrony.conf" -INITSCRIPT_NAME = "chronyd" -INITSCRIPT_PARAMS = "defaults" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "chronyd.service" - -# It's probably a bad idea to run chrony and another time daemon on -# the same system. systemd includes the SNTP client 'timesyncd', which -# will be disabled by chronyd.service, however it will remain on the rootfs -# wasting 150 kB unless you put 'PACKAGECONFIG:remove:pn-systemd = "timesyncd"' -# in a conf file or bbappend somewhere. -RCONFLICTS:${PN} = "ntp ntimed" - -# Separate the client program into its own package -PACKAGES =+ "chronyc" -FILES:chronyc = "${bindir}/chronyc" diff --git a/meta-networking/recipes-support/chrony/chrony_4.7.bb b/meta-networking/recipes-support/chrony/chrony_4.7.bb new file mode 100644 index 0000000000..0af542869e --- /dev/null +++ b/meta-networking/recipes-support/chrony/chrony_4.7.bb @@ -0,0 +1,141 @@ +SUMMARY = "Versatile implementation of the Network Time Protocol" +DESCRIPTION = "Chrony can synchronize the system clock with NTP \ +servers, reference clocks (e.g. GPS receiver), and manual input using \ +wristwatch and keyboard. It can also operate as an NTPv4 (RFC 5905) \ +server and peer to provide a time service to other computers in the \ +network. \ +\ +It is designed to perform well in a wide range of conditions, \ +including intermittent network connections, heavily congested \ +networks, changing temperatures (ordinary computer clocks are \ +sensitive to temperature), and systems that do not run continuously, or \ +run on a virtual machine. \ +\ +Typical accuracy between two machines on a LAN is in tens, or a few \ +hundreds, of microseconds; over the Internet, accuracy is typically \ +within a few milliseconds. With a good hardware reference clock \ +sub-microsecond accuracy is possible. \ +\ +Two programs are included in chrony: chronyd is a daemon that can be \ +started at boot time and chronyc is a command-line interface program \ +which can be used to monitor chronyd's performance and to change \ +various operating parameters whilst it is running. \ +\ +This recipe produces two binary packages: 'chrony' which contains chronyd, \ +the configuration file and the init script, and 'chronyc' which contains \ +the client program only." + +HOMEPAGE = "https://chrony.tuxfamily.org/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "https://chrony-project.org/releases/chrony-${PV}.tar.gz \ + file://chrony.conf \ + file://chronyd \ + file://arm_eabi.patch \ +" + +SRC_URI:append:libc-musl = " \ + file://0001-Fix-compilation-with-musl.patch \ +" +SRC_URI[sha256sum] = "c0de41a8c051e5d32b101b5f7014b98ca978b18e592f30ce6840b6d4602d947b" + +DEPENDS = "pps-tools" + +# Note: Despite being built via './configure; make; make install', +# chrony does not use GNU Autotools. +inherit update-rc.d systemd pkgconfig + +# Add chronyd user if privdrop packageconfig is selected +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)} +USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}" +USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /sbin/nologin chronyd;', '', d)}" + +# Configuration options: +# - Security-related: +# - 'sechash' is omitted by default because it pulls in nss which is huge. +# - 'privdrop' allows chronyd to run as non-root; would need changes to +# chrony.conf and init script. +# - 'scfilter' enables support for system call filtering, but requires the +# kernel to have CONFIG_SECCOMP enabled. +PACKAGECONFIG ??= "editline \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ +" +PACKAGECONFIG[editline] = ",--without-editline,libedit" +PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" +PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" +PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp" +PACKAGECONFIG[ipv6] = ",--disable-ipv6," +PACKAGECONFIG[nts] = ",--disable-nts,gnutls" + +# --disable-static isn't supported by chrony's configure script. +DISABLE_STATIC = "" + +do_configure() { + ./configure --sysconfdir=${sysconfdir} --bindir=${bindir} --sbindir=${sbindir} \ + --localstatedir=${localstatedir} --datarootdir=${datadir} \ + --with-ntp-era=$(shell date -d '1970-01-01 00:00:00+00:00' +'%s') \ + --with-pidfile=/run/chrony/chronyd.pid \ + --chronyrundir=/run/chrony \ + --host-system=Linux \ + ${PACKAGECONFIG_CONFARGS} +} + +do_install() { + # Binaries + install -d ${D}${bindir} + install -m 0755 ${S}/chronyc ${D}${bindir} + install -d ${D}${sbindir} + install -m 0755 ${S}/chronyd ${D}${sbindir} + + # Config file + install -d ${D}${sysconfdir} + install -m 644 ${UNPACKDIR}/chrony.conf ${D}${sysconfdir} + if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then + echo "# Define user to drop to after dropping root privileges" >> ${D}${sysconfdir}/chrony.conf + echo "user chronyd" >> ${D}${sysconfdir}/chrony.conf + fi + + # System V init script + install -d ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/chronyd ${D}${sysconfdir}/init.d + + # systemd unit configuration file + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/examples/chronyd.service ${D}${systemd_unitdir}/system/ + + # Variable data (for drift and/or rtc file) + install -d ${D}${localstatedir}/lib/chrony + + # Fix hard-coded paths in config files and init scripts + sed -i -e 's!/var/!${localstatedir}/!g' -e 's!/etc/!${sysconfdir}/!g' \ + -e 's!/usr/sbin/!${sbindir}/!g' -e 's!/usr/bin/!${bindir}/!g' \ + ${D}${sysconfdir}/chrony.conf \ + ${D}${sysconfdir}/init.d/chronyd \ + ${D}${systemd_unitdir}/system/chronyd.service + sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/chronyd + sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service + + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /var/lib/chrony 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/chronyd.conf + +} + +FILES:${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}" +CONFFILES:${PN} = "${sysconfdir}/chrony.conf" +INITSCRIPT_NAME = "chronyd" +INITSCRIPT_PARAMS = "defaults" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "chronyd.service" + +# It's probably a bad idea to run chrony and another time daemon on +# the same system. systemd includes the SNTP client 'timesyncd', which +# will be disabled by chronyd.service, however it will remain on the rootfs +# wasting 150 kB unless you put 'PACKAGECONFIG:remove:pn-systemd = "timesyncd"' +# in a conf file or bbappend somewhere. +RCONFLICTS:${PN} = "ntp ntimed" + +# Separate the client program into its own package +PACKAGES =+ "chronyc" +FILES:chronyc = "${bindir}/chronyc" -- cgit v1.2.3-54-g00ecf