Bump buidlroot version to 2018.02.6
This commit is contained in:
38
bsp/buildroot/package/openntpd/0001-fix-musl.patch
Normal file
38
bsp/buildroot/package/openntpd/0001-fix-musl.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Fri, 29 Sep 2017 10:06:52 +0300
|
||||
Subject: [PATCH] Fix build with musl and older Linux kernel
|
||||
|
||||
The musl libc carries its own copy of Linux system calls. When building
|
||||
with Linux headers older than v3.17, musl provides SYS_getrandom
|
||||
definition, but not GRND_NONBLOCK. This causes build failure for
|
||||
libressl and openntpd:
|
||||
|
||||
getentropy_linux.c: In function 'getentropy_getrandom':
|
||||
getentropy_linux.c:205:42: error: 'GRND_NONBLOCK' undeclared (first use in this function)
|
||||
ret = syscall(SYS_getrandom, buf, len, GRND_NONBLOCK);
|
||||
^~~~~~~~~~~~~
|
||||
|
||||
Define GRND_NONBLOCK locally when its definition is missing to fix the
|
||||
build. There should be no run-time effect. Older kernels return ENOSYS
|
||||
for unsupported syscall().
|
||||
|
||||
[ from upstream pull request with file location changed ]
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/libressl-portable/openbsd/pull/82
|
||||
|
||||
diff -Nuar openntpd-6.2p2-orig/compat/getentropy_linux.c openntpd-6.2p2/compat/getentropy_linux.c
|
||||
--- openntpd-6.2p2-orig/compat/getentropy_linux.c 2017-09-07 22:12:02.000000000 +0300
|
||||
+++ openntpd-6.2p2/compat/getentropy_linux.c 2017-09-29 11:54:54.856245770 +0300
|
||||
@@ -194,6 +194,11 @@
|
||||
}
|
||||
|
||||
#ifdef SYS_getrandom
|
||||
+
|
||||
+#ifndef GRND_NONBLOCK
|
||||
+#define GRND_NONBLOCK 0x0001
|
||||
+#endif
|
||||
+
|
||||
static int
|
||||
getentropy_getrandom(void *buf, size_t len)
|
||||
{
|
||||
@@ -9,6 +9,9 @@ config BR2_PACKAGE_OPENNTPD
|
||||
to remote NTP servers and can act as NTP server itself,
|
||||
redistributing the local clock. It just works.
|
||||
|
||||
Crypto support is available if the LibreSSL library is
|
||||
enabled.
|
||||
|
||||
http://www.openntpd.org/
|
||||
|
||||
comment "openntpd needs a toolchain w/ NPTL"
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
# From http://www.openntpd.org/txt/release-6.0p1.txt
|
||||
sha256 b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 openntpd-6.0p1.tar.gz
|
||||
# from http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/SHA256
|
||||
sha256 7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a openntpd-6.2p3.tar.gz
|
||||
|
||||
# Locally computed
|
||||
sha256 6c1822ee950652c12bb3773849db18794f62c63452a70d018edf23e8cba71839 COPYING
|
||||
|
||||
@@ -4,13 +4,19 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENNTPD_VERSION = 6.0p1
|
||||
OPENNTPD_VERSION = 6.2p3
|
||||
OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
|
||||
OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3c
|
||||
OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause
|
||||
OPENNTPD_LICENSE_FILES = COPYING
|
||||
# Ships a beta libtool version hence our patch doesn't apply.
|
||||
# Need to autoreconf for our libtool patch to apply properly
|
||||
OPENNTPD_AUTORECONF = YES
|
||||
|
||||
# Openntpd searches for tls_config_set_ca_mem which is only available
|
||||
# in LibreSSL
|
||||
ifeq ($(BR2_PACKAGE_LIBRESSL),y)
|
||||
OPENNTPD_DEPENDENCIES += openssl
|
||||
endif
|
||||
|
||||
# openntpd uses pthread functions for arc4random emulation but forgets
|
||||
# to use -pthread
|
||||
OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread"
|
||||
|
||||
Reference in New Issue
Block a user