lxc: bump to version 3.0.0

deleted file mode 100644
index 031f77539f..0000000000
@@ -1,98 +0,0 @@
-From f48b5fd8ab03c200eaf5e3a9b03bcd01b2659cf3 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Thu, 2 Nov 2017 16:00:33 +0100
-Subject: [PATCH] Fix compilation on toolchain without prlimit
-
-Some toolchains which are not bionic like uclibc does not support
-prlimit or prlimit64. In this case, return an error.
-Moreover, if prlimit64 is available, use lxc implementation of prlimit.
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- configure.ac        |  4 ++++
- src/lxc/Makefile.am |  6 ++++++
- src/lxc/conf.c      | 12 +++++++++---
- 3 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 642b78e7..63df7466 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -671,6 +671,10 @@ AC_CHECK_FUNCS([prlimit],
- 	AM_CONDITIONAL(HAVE_PRLIMIT, true)
- 	AC_DEFINE(HAVE_PRLIMIT,1,[Have prlimit]),
- 	AM_CONDITIONAL(HAVE_PRLIMIT, false))
-+AC_CHECK_FUNCS([prlimit64],
-+	AM_CONDITIONAL(HAVE_PRLIMIT64, true)
-+	AC_DEFINE(HAVE_PRLIMIT64,1,[Have prlimit64]),
-+	AM_CONDITIONAL(HAVE_PRLIMIT64, false))
- 
- # Check for some libraries
- AC_SEARCH_LIBS(sem_open, [rt pthread])
-diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
-index fff32ae4..8f0c11ec 100644
---- a/src/lxc/Makefile.am
-+++ b/src/lxc/Makefile.am
-@@ -45,7 +45,10 @@ noinst_HEADERS += \
- 	../include/ifaddrs.h \
- 	../include/openpty.h \
- 	../include/lxcmntent.h
-+endif
-+
- if !HAVE_PRLIMIT
-+if HAVE_PRLIMIT64
- noinst_HEADERS += ../include/prlimit.h
- endif
- endif
-@@ -143,7 +146,10 @@ liblxc_la_SOURCES += \
- 	../include/ifaddrs.c ../include/ifaddrs.h \
- 	../include/openpty.c ../include/openpty.h \
- 	../include/lxcmntent.c ../include/lxcmntent.h
-+endif
-+
- if !HAVE_PRLIMIT
-+if HAVE_PRLIMIT64
- liblxc_la_SOURCES += ../include/prlimit.c ../include/prlimit.h
- endif
- endif
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index 44d97843..8a66f2d0 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -97,13 +97,14 @@
- 
- #if IS_BIONIC
- #include <../include/lxcmntent.h>
--#ifndef HAVE_PRLIMIT
--#include <../include/prlimit.h>
--#endif
- #else
- #include <mntent.h>
- #endif
- 
-+#if !defined(HAVE_PRLIMIT) && defined(HAVE_PRLIMIT64)
-+#include <../include/prlimit.h>
-+#endif
-+
- lxc_log_define(lxc_conf, lxc);
- 
- #if HAVE_LIBCAP
-@@ -2399,10 +2400,15 @@ int setup_resource_limits(struct lxc_list *limits, pid_t pid) {
- 			return -1;
- 		}
- 
-+#if HAVE_PRLIMIT || HAVE_PRLIMIT64
- 		if (prlimit(pid, resid, &lim->limit, NULL) != 0) {
- 			ERROR("failed to set limit %s: %s", lim->resource, strerror(errno));
- 			return -1;
- 		}
-+#else
-+		ERROR("Cannot set limit %s as prlimit is missing", lim->resource);
-+		return -1;
-+#endif
- 	}
- 	return 0;
- }
--- 
-2.14.1
-

49 lines not on this page · raw message

index d8526e93a3..e2f9108507 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	68663a67450a8d6734e137eac54cc7077209fb15c456eec401a2c26e6386eff6	lxc-2.1.1.tar.gz
+sha256	6230224c27f050201b372b18a9f39cd220ed584899c5f0cf73c6b313dabc8d8a	lxc-3.0.0.tar.gz
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING

index a65c166664..5a7038f88f 100644
@@ -4,17 +4,15 @@
 #
 ################################################################################
 
-LXC_VERSION = 2.1.1
+LXC_VERSION = 3.0.0
 LXC_SITE = https://linuxcontainers.org/downloads/lxc
 LXC_LICENSE = LGPL-2.1+
 LXC_LICENSE_FILES = COPYING
 LXC_DEPENDENCIES = host-pkgconf
 LXC_INSTALL_STAGING = YES
-# We're patching configure.ac
-LXC_AUTORECONF = YES
 
 LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
-	--disable-python --disable-werror \
+	--disable-werror \
 	$(if $(BR2_PACKAGE_BASH),,--disable-bash)
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)

@@ -45,15 +43,4 @@ else
 LXC_CONF_OPTS += --disable-selinux
 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))