[Buildroot] [PATCH 1/2] package/lxc: bump version to 1.1.5

[Buildroot] [PATCH 1/2] package/lxc: bump version to 1.1.5

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lxc/lxc.hash | 4 ++--
 package/lxc/lxc.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash
index d5b8ec5..7470101 100644
--- a/package/lxc/lxc.hash
+++ b/package/lxc/lxc.hash
@@ -1,2 +1,2 @@
-# Locally calculated after checking pgp signature
-sha256 8f072ea2001bc94389003d82a91902855edf16b609e06f0486a74e4b8973e5dc lxc-1.1.4.tar.gz
+# Locally calculated
+sha256	9588ad1b04e114ee7370f690c65131e28098b28d2521d97c73557d11897ed0be	lxc-1.1.5.tar.gz
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
index b11464e..df25180 100644
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LXC_VERSION = 1.1.4
+LXC_VERSION = 1.1.5
 LXC_SITE = https://linuxcontainers.org/downloads
 LXC_LICENSE = LGPLv2.1+
 LXC_LICENSE_FILES = COPYING
-- 
2.7.0.rc3

[Buildroot] [PATCH 2/2] package/lxc: fix musl build

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/52d/52da7ccde83364169ce85c26a6ac701c606036c5/
http://autobuild.buildroot.net/results/6b5/6b5c57cbd95fb4387db0d059c9e92c47b18174f6/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/lxc/0002-fix-musl.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/lxc/0002-fix-musl.patch

diff --git a/package/lxc/0002-fix-musl.patch b/package/lxc/0002-fix-musl.patch
new file mode 100644
index 0000000..f1f8527
--- /dev/null
+++ b/package/lxc/0002-fix-musl.patch
@@ -0,0 +1,18 @@
+Fix musl build
+
+Patch downloaded from
+https://lists.linuxcontainers.org/pipermail/lxc-devel/2014-January/007648.html
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr lxc-1.1.5.org/src/lxc/lxc_user_nic.c lxc-1.1.5/src/lxc/lxc_user_nic.c
+--- lxc-1.1.5.org/src/lxc/lxc_user_nic.c	2015-11-09 17:25:59.000000000 +0100
++++ lxc-1.1.5/src/lxc/lxc_user_nic.c	2016-01-23 15:32:57.000000000 +0100
+@@ -40,7 +40,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.7.0.rc3

[Buildroot] [PATCH 1/2] package/lxc: bump version to 1.1.5

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sat, 23 Jan 2016 15:37:51 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/lxc/lxc.hash | 4 ++--
>  package/lxc/lxc.mk   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied, after changing the download location to the new one, as
noticed by Santosh.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com