Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
From 1e64bc4c4379ae3e55be3c518e0e3e22c8c4ae77 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Tue, 14 Nov 2017 13:23:57 +0200
|
||||
Subject: [PATCH] ntp: fix build with musl libc
|
||||
|
||||
The configure script enables HAVE_LINUX_TIMESTAMPING_OPT_PKTINFO based
|
||||
on the existence of struct scm_ts_pktinfo and
|
||||
SOF_TIMESTAMPING_OPT_PKTINFO that were introduced in Linux kernel v4.13
|
||||
in the linux/net_tstamp.h kernel header. But this feature also requires
|
||||
SCM_TIMESTAMPING_PKTINFO that is defined in the socket.h header. musl
|
||||
libc provides its own version of socket.h, and as of musl version 1.1.16
|
||||
this macro is missing. Define this macro in the code as a temporary
|
||||
measure until musl is updated to its latest version.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: not upstreamable
|
||||
---
|
||||
ntp_io_linux.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/ntp_io_linux.c b/ntp_io_linux.c
|
||||
index 00caed06f7ba..2214a6f6f6c5 100644
|
||||
--- a/ntp_io_linux.c
|
||||
+++ b/ntp_io_linux.c
|
||||
@@ -574,6 +574,10 @@ extract_udp_data(unsigned char *msg, NTP_Remote_Address *remote_addr, int len)
|
||||
|
||||
/* ================================================== */
|
||||
|
||||
+#ifndef SCM_TIMESTAMPING_PKTINFO
|
||||
+#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
+#endif
|
||||
+
|
||||
int
|
||||
NIO_Linux_ProcessMessage(NTP_Remote_Address *remote_addr, NTP_Local_Address *local_addr,
|
||||
NTP_Local_Timestamp *local_ts, struct msghdr *hdr, int length)
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From 7c5bd948bb7e21fa0ee22f29e97748b2d0360319 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Lichvar <mlichvar@redhat.com>
|
||||
Date: Thu, 17 May 2018 14:16:58 +0200
|
||||
Subject: [PATCH] util: fall back to reading /dev/urandom when getrandom()
|
||||
blocks
|
||||
|
||||
With recent changes in the Linux kernel, the getrandom() system call may
|
||||
block for a long time after boot on machines that don't have enough
|
||||
entropy. It blocks the chronyd's initialization before it can detach
|
||||
from the terminal and may cause a chronyd service to fail to start due
|
||||
to a timeout.
|
||||
|
||||
At least for now, enable the GRND_NONBLOCK flag to make the system call
|
||||
non-blocking and let the code fall back to reading /dev/urandom (which
|
||||
never blocks) if the system call failed with EAGAIN or any other error.
|
||||
|
||||
This makes the start of chronyd non-deterministic with respect to files
|
||||
that it needs to open and possibly also makes it slightly easier to
|
||||
guess the transmit/receive timestamp in client requests until the
|
||||
urandom source is fully initialized.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
util.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util.c b/util.c
|
||||
index 4b3e455..76417d5 100644
|
||||
--- a/util.c
|
||||
+++ b/util.c
|
||||
@@ -1224,7 +1224,7 @@ get_random_bytes_getrandom(char *buf, unsigned int len)
|
||||
if (disabled)
|
||||
break;
|
||||
|
||||
- if (getrandom(rand_buf, sizeof (rand_buf), 0) != sizeof (rand_buf)) {
|
||||
+ if (getrandom(rand_buf, sizeof (rand_buf), GRND_NONBLOCK) != sizeof (rand_buf)) {
|
||||
disabled = 1;
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2016/11/msg00000.html
|
||||
md5 d08dd5a7d79a89891d119adcccb4397d chrony-2.4.1.tar.gz
|
||||
sha1 b412375ca90dbef653ad00534f8b73b825e396d4 chrony-2.4.1.tar.gz
|
||||
# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2017/09/msg00000.html
|
||||
md5 f4c4eb0dc92f35ee4bb7d3dcd8029ecb chrony-3.2.tar.gz
|
||||
sha1 64db6c31e013222cc0a2b66322192b4cedf6e048 chrony-3.2.tar.gz
|
||||
# Locally calculated
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
|
||||
@@ -4,16 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CHRONY_VERSION = 2.4.1
|
||||
CHRONY_VERSION = 3.2
|
||||
CHRONY_SITE = http://download.tuxfamily.org/chrony
|
||||
CHRONY_LICENSE = GPLv2
|
||||
CHRONY_LICENSE = GPL-2.0
|
||||
CHRONY_LICENSE_FILES = COPYING
|
||||
|
||||
CHRONY_CONF_OPTS = \
|
||||
--host-system=Linux \
|
||||
--host-machine=$(BR2_ARCH) \
|
||||
--prefix=/usr \
|
||||
--without-seccomp \
|
||||
--without-tomcrypt
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
@@ -28,6 +27,13 @@ else
|
||||
CHRONY_CONF_OPTS += --without-nss
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
||||
CHRONY_CONF_OPTS += --enable-scfilter
|
||||
CHRONY_DEPENDENCIES += libseccomp
|
||||
else
|
||||
CHRONY_CONF_OPTS += --without-seccomp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
CHRONY_DEPENDENCIES += readline
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user