diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-07-12 14:40:23 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-07-12 14:40:23 -0400 |
commit | baa8c9cd62988121c39ae848cd967859fbbf5250 (patch) | |
tree | 021637f1fc818ac5017a4c67220abbd084892186 /recipes-containers/lxc/files/configure-skip-libseccomp-tests-if-it-is-disabled.patch | |
parent | 803e7080ceb28094a28afac54732245fd4302246 (diff) | |
download | meta-virtualization-baa8c9cd62988121c39ae848cd967859fbbf5250.tar.gz |
lxc: update to 4.0.9
Bumping lxc to a newer 4.0 -stable release.
We drop two patches that have been integrated to the upstream repo, but
otherwise, things are the same.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/lxc/files/configure-skip-libseccomp-tests-if-it-is-disabled.patch')
-rw-r--r-- | recipes-containers/lxc/files/configure-skip-libseccomp-tests-if-it-is-disabled.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/recipes-containers/lxc/files/configure-skip-libseccomp-tests-if-it-is-disabled.patch b/recipes-containers/lxc/files/configure-skip-libseccomp-tests-if-it-is-disabled.patch deleted file mode 100644 index 43c91bab..00000000 --- a/recipes-containers/lxc/files/configure-skip-libseccomp-tests-if-it-is-disabled.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 67cd8bde2d46983df8fa9f647e9fc0b96370ec29 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eneas U de Queiroz <cotequeiroz@gmail.com> | ||
3 | Date: Sat, 16 Jan 2021 13:54:07 -0300 | ||
4 | Subject: [PATCH] configure: skip libseccomp tests if it is disabled | ||
5 | |||
6 | Move the block checking for libseccomp api compatibility inside | ||
7 | AM_COND_IF([ENABLE_SECCOMP] ... ). | ||
8 | |||
9 | Upstream-Status: submitted [https://github.com/lxc/lxc/pull/3623] | ||
10 | |||
11 | Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 17 ++++++++--------- | ||
14 | 1 file changed, 8 insertions(+), 9 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index f58487f5d..ce6363136 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -312,6 +312,14 @@ AM_COND_IF([ENABLE_SECCOMP], | ||
21 | AC_CHECK_LIB([seccomp], [seccomp_init],[],[AC_MSG_ERROR([You must install the seccomp development package in order to compile lxc])]) | ||
22 | AC_SUBST([SECCOMP_LIBS], [-lseccomp]) | ||
23 | ]) | ||
24 | + # HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0 | ||
25 | + OLD_CFLAGS="$CFLAGS" | ||
26 | + CFLAGS="$CFLAGS $SECCOMP_CFLAGS" | ||
27 | + AC_CHECK_TYPES([scmp_filter_ctx], [], [], [[#include <seccomp.h>]]) | ||
28 | + AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include <seccomp.h>]]) | ||
29 | + AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include <seccomp.h>]]) | ||
30 | + AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include <seccomp.h>]]) | ||
31 | + CFLAGS="$OLD_CFLAGS" | ||
32 | ]) | ||
33 | |||
34 | AC_MSG_CHECKING(for static libcap) | ||
35 | @@ -359,15 +367,6 @@ AM_COND_IF([ENABLE_CAP], | ||
36 | AC_CHECK_LIB(cap,cap_get_file, AC_DEFINE(LIBCAP_SUPPORTS_FILE_CAPABILITIES,1,[Have cap_get_file]),[],[]) | ||
37 | AC_SUBST([CAP_LIBS], [-lcap])]) | ||
38 | |||
39 | -# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0 | ||
40 | -OLD_CFLAGS="$CFLAGS" | ||
41 | -CFLAGS="$CFLAGS $SECCOMP_CFLAGS" | ||
42 | -AC_CHECK_TYPES([scmp_filter_ctx], [], [], [[#include <seccomp.h>]]) | ||
43 | -AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include <seccomp.h>]]) | ||
44 | -AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include <seccomp.h>]]) | ||
45 | -AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include <seccomp.h>]]) | ||
46 | -CFLAGS="$OLD_CFLAGS" | ||
47 | - | ||
48 | AC_CHECK_HEADERS([linux/bpf.h], [ | ||
49 | AC_CHECK_TYPES([struct bpf_cgroup_dev_ctx], [], [], [[#include <linux/bpf.h>]]) | ||
50 | ], [], []) | ||
51 | -- | ||
52 | 2.17.1 | ||
53 | |||