diff options
author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2017-11-02 23:09:34 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-11-03 22:03:18 +0100 |
commit | abc292a625f0b7372b89cdb5a6876a7457ea6aa4 (patch) | |
tree | 0898474f2e45cc2fbd8cb396b1e0e45e5fd3b788 /package/lxc/0001-conf-fix-build-without-libcap.patch | |
parent | b20351941764b447e7f861130a19a0768730f870 (diff) | |
download | buildroot-abc292a625f0b7372b89cdb5a6876a7457ea6aa4.tar.gz buildroot-abc292a625f0b7372b89cdb5a6876a7457ea6aa4.zip |
lxc: bump to version 2.1.1
Remove 0001-conf-fix-build-without-libcap.patch (already in 2.1.1)
Add 0001-Fix-compilation-on-toolchain-without-prlimit.patch (merged
upstream)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/lxc/0001-conf-fix-build-without-libcap.patch')
-rw-r--r-- | package/lxc/0001-conf-fix-build-without-libcap.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/package/lxc/0001-conf-fix-build-without-libcap.patch b/package/lxc/0001-conf-fix-build-without-libcap.patch deleted file mode 100644 index 7e7c01073b..0000000000 --- a/package/lxc/0001-conf-fix-build-without-libcap.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bc5b27d6f6d166d2a6df47982cbe36041ce6b735 Mon Sep 17 00:00:00 2001 -From: Dima Krasner <dima@securingsam.com> -Date: Sun, 14 May 2017 12:24:59 +0300 -Subject: [PATCH] conf: fix build without libcap - -Signed-off-by: Dima Krasner <samdima@securingsam.com> -[Upstream commit: https://github.com/lxc/lxc/commit/bc5b27d6f6d166d2a6df47982cbe36041ce6b735] -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - src/lxc/conf.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index 35bdb249b..76a190120 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -130,6 +130,14 @@ lxc_log_define(lxc_conf, lxc); - #define LO_FLAGS_AUTOCLEAR 4 - #endif - -+#ifndef CAP_SETUID -+#define CAP_SETUID 7 -+#endif -+ -+#ifndef CAP_SETGID -+#define CAP_SETGID 6 -+#endif -+ - /* needed for cgroup automount checks, regardless of whether we - * have included linux/capability.h or not */ - #ifndef CAP_SYS_ADMIN |