Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -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