Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,87 @@
|
||||
From c93bb184ce996c4d77eefbae2ab0bf74f396ec45 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Tue, 13 Mar 2018 06:53:06 +0200
|
||||
Subject: [PATCH] memfd: fix build with glibc 2.27
|
||||
|
||||
glibc 2.27 added a wrapper for memfd_create(). This causes build
|
||||
failure:
|
||||
|
||||
fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration
|
||||
static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
|
||||
^~~~~~~~~~~~
|
||||
|
||||
Don't use the local definition when the libc provides one.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/kernelslacker/trinity/pull/23
|
||||
|
||||
configure | 23 +++++++++++++++++++++++
|
||||
fds/memfd.c | 3 +++
|
||||
2 files changed, 26 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index dc0a87d8c1ad..c0166af33048 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -288,6 +288,29 @@ else
|
||||
echo "#define USE_BTRFS 1" >> $CONFIGH
|
||||
fi
|
||||
|
||||
+#############################################################################################
|
||||
+# Does glibc provide memfd_create() syscall wrapper
|
||||
+#
|
||||
+echo -n "[*] Checking if glibc provides memfd_create.. "
|
||||
+rm -f "$TMP" || exit 1
|
||||
+
|
||||
+cat >"$TMP.c" << EOF
|
||||
+#include <sys/mman.h>
|
||||
+
|
||||
+void main()
|
||||
+{
|
||||
+ memfd_create();
|
||||
+}
|
||||
+EOF
|
||||
+
|
||||
+${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
|
||||
+if [ ! -x "$TMP" ]; then
|
||||
+ echo $RED "[NO]" $COL_RESET
|
||||
+else
|
||||
+ echo $GREEN "[YES]" $COL_RESET
|
||||
+ echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH
|
||||
+fi
|
||||
+
|
||||
#############################################################################################
|
||||
|
||||
check_header linux/caif/caif_socket.h USE_CAIF
|
||||
diff --git a/fds/memfd.c b/fds/memfd.c
|
||||
index 210678e4571c..aaaac2f78f54 100644
|
||||
--- a/fds/memfd.c
|
||||
+++ b/fds/memfd.c
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
+#include <sys/mman.h>
|
||||
|
||||
#include "fd.h"
|
||||
#include "memfd.h"
|
||||
@@ -16,6 +17,7 @@
|
||||
#include "trinity.h"
|
||||
#include "udp.h"
|
||||
|
||||
+#ifndef USE_MEMFD_CREATE
|
||||
static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
|
||||
{
|
||||
#ifdef SYS_memfd_create
|
||||
@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl
|
||||
return -ENOSYS;
|
||||
#endif
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void memfd_destructor(struct object *obj)
|
||||
{
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
From 5431126ac94bf81743852493a041e80e82918741 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Fri, 8 Jun 2018 06:05:26 +0300
|
||||
Subject: [PATCH] configure: fix build with kernel headers v4.17+
|
||||
|
||||
Kernel v4.17 removed the linux/irda.h header. Skip the irda test when
|
||||
this header is missing.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/kernelslacker/trinity/pull/25
|
||||
|
||||
configure | 1 +
|
||||
net/proto-irda.c | 6 +++++-
|
||||
net/protocols.c | 2 ++
|
||||
3 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index c0166af33048..944c8cf77d1b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -316,6 +316,7 @@ fi
|
||||
check_header linux/caif/caif_socket.h USE_CAIF
|
||||
check_header linux/fsmap.h USE_FSMAP
|
||||
check_header linux/if_alg.h USE_IF_ALG
|
||||
+check_header linux/irda.h USE_IRDA
|
||||
check_header linux/rds.h USE_RDS
|
||||
check_header linux/vfio.h USE_VFIO
|
||||
check_header drm/drm.h USE_DRM
|
||||
diff --git a/net/proto-irda.c b/net/proto-irda.c
|
||||
index 02d51bcd2ee0..264e36dfa040 100644
|
||||
--- a/net/proto-irda.c
|
||||
+++ b/net/proto-irda.c
|
||||
@@ -4,13 +4,15 @@
|
||||
#include <sys/un.h>
|
||||
/* old irda.h does not include something which defines sa_family_t */
|
||||
#include <netinet/in.h>
|
||||
-#include <linux/irda.h>
|
||||
#include <stdlib.h>
|
||||
#include "net.h"
|
||||
#include "random.h"
|
||||
#include "utils.h" // RAND_ARRAY
|
||||
#include "compat.h"
|
||||
|
||||
+#ifdef USE_IRDA
|
||||
+#include <linux/irda.h>
|
||||
+
|
||||
static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
|
||||
{
|
||||
struct sockaddr_irda *irda;
|
||||
@@ -53,3 +55,5 @@ const struct netproto proto_irda = {
|
||||
.valid_triplets = irda_triplets,
|
||||
.nr_triplets = ARRAY_SIZE(irda_triplets),
|
||||
};
|
||||
+
|
||||
+#endif
|
||||
diff --git a/net/protocols.c b/net/protocols.c
|
||||
index 90a60affedca..87acf85c707f 100644
|
||||
--- a/net/protocols.c
|
||||
+++ b/net/protocols.c
|
||||
@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = {
|
||||
#ifdef USE_RDS
|
||||
[PF_RDS] = { .proto = &proto_rds },
|
||||
#endif
|
||||
+#ifdef USE_IRDA
|
||||
[PF_IRDA] = { .proto = &proto_irda },
|
||||
+#endif
|
||||
[PF_LLC] = { .proto = &proto_llc },
|
||||
[PF_CAN] = { .proto = &proto_can },
|
||||
[PF_TIPC] = { .proto = &proto_tipc },
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
From a5f32b9714613404e9f4699aaaad720f2bb033b4 Mon Sep 17 00:00:00 2001
|
||||
From: Vinson Lee <vlee@freedesktop.org>
|
||||
Date: Thu, 23 Aug 2018 22:28:49 +0000
|
||||
Subject: [PATCH] Check if VIDIOC_RESERVED is defined.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
VIDIOC_RESERVED was removed in Linux 4.19.
|
||||
|
||||
commit ea8532daee31bc72abfbc9ca7a43cbec0f6c05af
|
||||
Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
|
||||
Date: Wed May 30 11:07:05 2018 -0400
|
||||
|
||||
media: videodev2: get rid of VIDIOC_RESERVED
|
||||
|
||||
While this ioctl is there at least since Kernel 2.6.12-rc2, it
|
||||
was never used by any upstream driver.
|
||||
|
||||
Get rid of it.
|
||||
|
||||
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
|
||||
|
||||
This patch fixes this build error.
|
||||
|
||||
CC ioctls/videodev2.o
|
||||
In file included from ioctls/videodev2.c:4:
|
||||
ioctls/videodev2.c:8:8: error: ‘VIDIOC_RESERVED’ undeclared here (not in a function); did you mean ‘VIDIOC_G_STD’?
|
||||
IOCTL(VIDIOC_RESERVED),
|
||||
^~~~~~~~~~~~~~~
|
||||
include/ioctls.h:53:15: note: in definition of macro ‘IOCTL’
|
||||
{ .request = _request, .name = #_request, }
|
||||
^~~~~~~~
|
||||
|
||||
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/kernelslacker/trinity/commit/a5f32b9714613404e9f4699aaaad720f2bb033b4]
|
||||
---
|
||||
ioctls/videodev2.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/ioctls/videodev2.c b/ioctls/videodev2.c
|
||||
index f7183f29..67089abf 100644
|
||||
--- a/ioctls/videodev2.c
|
||||
+++ b/ioctls/videodev2.c
|
||||
@@ -5,7 +5,9 @@
|
||||
|
||||
static const struct ioctl videodev2_ioctls[] = {
|
||||
IOCTL(VIDIOC_QUERYCAP),
|
||||
+#ifdef VIDIOC_RESERVED
|
||||
IOCTL(VIDIOC_RESERVED),
|
||||
+#endif
|
||||
IOCTL(VIDIOC_ENUM_FMT),
|
||||
IOCTL(VIDIOC_G_FMT),
|
||||
IOCTL(VIDIOC_S_FMT),
|
||||
@@ -0,0 +1,48 @@
|
||||
From 350c05e5c0d7af5941a9c17f2f86e1c6297d7475 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Wed, 12 Dec 2018 20:52:50 +0200
|
||||
Subject: [PATCH] proto-rds: include libc network headers first
|
||||
|
||||
To avoid collisions between libc networking headers and header kernels
|
||||
the libc headers must appear first in the list of headers. This fixes a
|
||||
build issue with kernel headers v4.19:
|
||||
|
||||
In file included from include/net.h:5:0,
|
||||
from net/proto-rds.c:6:
|
||||
.../sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr'
|
||||
struct in6_addr {
|
||||
^~~~~~~~
|
||||
In file included from .../sysroot/usr/include/linux/rds.h:40:0,
|
||||
from net/proto-rds.c:4:
|
||||
.../sysroot/usr/include/linux/in6.h:33:8: note: originally defined here
|
||||
struct in6_addr {
|
||||
^~~~~~~~
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/kernelslacker/trinity/pull/29
|
||||
|
||||
net/proto-rds.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/proto-rds.c b/net/proto-rds.c
|
||||
index c8ff22f886c3..06e36e82d990 100644
|
||||
--- a/net/proto-rds.c
|
||||
+++ b/net/proto-rds.c
|
||||
@@ -1,12 +1,12 @@
|
||||
#ifdef USE_RDS
|
||||
#include <sys/socket.h>
|
||||
#include <stdint.h>
|
||||
-#include <linux/rds.h>
|
||||
#include <stdlib.h>
|
||||
#include "net.h"
|
||||
#include "compat.h"
|
||||
#include "random.h"
|
||||
#include "utils.h" // RAND_ARRAY
|
||||
+#include <linux/rds.h>
|
||||
|
||||
static void rds_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
|
||||
{
|
||||
--
|
||||
2.19.2
|
||||
|
||||
Reference in New Issue
Block a user