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

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bsp/buildroot/package/lxc/0001-drop-werror.patch
View File

@@ -1,16 +0,0 @@
Don't do -Werror it breaks builds on some scenarios with trivialities.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura lxc-lxc-1.0.4/configure.ac lxc-lxc-1.0.4.orig/configure.ac
--- lxc-lxc-1.0.4.orig/configure.ac 2014-07-04 10:31:19.821029891 -0300
+++ lxc-lxc-1.0.4/configure.ac 2014-06-13 14:07:45.000000000 -0300
@@ -560,7 +560,7 @@
LXC_CHECK_TLS
if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -Wall -Werror"
+ CFLAGS="$CFLAGS -Wall"
fi
# Files requiring some variable expansion

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

@@ -1,43 +0,0 @@
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

2
bsp/buildroot/package/lxc/lxc.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 9588ad1b04e114ee7370f690c65131e28098b28d2521d97c73557d11897ed0be lxc-1.1.5.tar.gz
sha256 1c09c075f06ec029f86fa6370c7d379494ff4c66a129eda17af7b7b41e055f5d lxc-2.0.7.tar.gz

26
bsp/buildroot/package/lxc/lxc.mk
View File

@@ -4,17 +4,24 @@
#
################################################################################
LXC_VERSION = 1.1.5
LXC_VERSION = 2.0.7
LXC_SITE = https://linuxcontainers.org/downloads/lxc
LXC_LICENSE = LGPLv2.1+
LXC_LICENSE_FILES = COPYING
LXC_DEPENDENCIES = libcap host-pkgconf
# we're patching configure.ac
LXC_AUTORECONF = YES
LXC_INSTALL_STAGING = YES
LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
--disable-lua --disable-python \
--disable-python --disable-werror \
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
ifeq ($(BR2_PACKAGE_GNUTLS),y)
LXC_CONF_OPTS += --enable-gnutls
LXC_DEPENDENCIES += gnutls
else
LXC_CONF_OPTS += --disable-gnutls
endif
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
LXC_CONF_OPTS += --enable-seccomp
LXC_DEPENDENCIES += libseccomp
@@ -22,4 +29,15 @@ else
LXC_CONF_OPTS += --disable-seccomp
endif
ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
LXC_CONF_OPTS += --enable-lua
LXC_DEPENDENCIES += luainterpreter
ifeq ($(BR2_PACKAGE_LUAJIT),y)
# By default, lxc will only search for lua.pc
LXC_CONF_OPTS += --with-lua-pc=luajit
endif
else
LXC_CONF_OPTS += --disable-lua
endif
$(eval $(autotools-package))