rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
bsp/buildroot/package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch Normal file
View File

@@ -0,0 +1,43 @@
From 245bba9aadf8e7aea487b6fbd851f86c75524552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
Date: Thu, 19 May 2016 21:51:27 +0200
Subject: [PATCH] Fix redefinition of struct in6_addr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
struct in6_addr is both defined in the C library header <netinet/in.h>
and the Linux kernel header <linux/in6.h>.
lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The
later one includes <linux/in6.h>.
This breaks build with the musl libc:
error: redefinition of ‘struct in6_addr’
As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it
is safe to remove this header.
Upstream status: Pending
https://github.com/lxc/lxc/pull/1029
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
src/lxc/lxc_user_nic.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c
index 87780ca..0cb38ba 100644
--- a/src/lxc/lxc_user_nic.c
+++ b/src/lxc/lxc_user_nic.c
@@ -41,7 +41,6 @@
#include <net/if.h>
#include <net/if_arp.h>
#include <netinet/in.h>
-#include <linux/if_bridge.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
--
2.8.2

5
bsp/buildroot/package/lxc/Config.in
View File

@@ -5,9 +5,7 @@ config BR2_PACKAGE_LXC
depends on BR2_USE_MMU # fork()
# build system forcefully builds a shared library
depends on !BR2_STATIC_LIBS
# the toolchain doesn't support setns syscall
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libcap
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call
help
Linux Containers (LXC), provides the ability to group and isolate
of a set of processes in a jail by virtualizing and accounting the
@@ -17,7 +15,6 @@ config BR2_PACKAGE_LXC
comment "lxc needs a toolchain w/ threads, headers >= 3.0, dynamic library"
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
depends on !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \
|| BR2_STATIC_LIBS