diff options
| author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-09-08 17:02:31 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-10 22:36:02 -0400 |
| commit | ba35378ce5e24f2bfcb85caa806774b873983d9f (patch) | |
| tree | c57c52175acf67f02ffac62234a9c1b3c7927551 /recipes-containers/criu/files/disable-selinux.patch | |
| parent | 8d40af1278ead368afe14bce8713145730b453a2 (diff) | |
| download | meta-virtualization-ba35378ce5e24f2bfcb85caa806774b873983d9f.tar.gz | |
criu: uprev to version 3.4
Our current version of criu is about a year old and has some
compilation issues with the latest gcc (currently it is
unbuildable). Since the version of criu and the kernel version are
fairly tightly coupled it wouldn't be surprising of this old criu
would also be exhibiting some runtime issues with our fairly new
kernel version.
With the above in mind we uprev to criu v3.4 which was recently
released. This requires several of the patches to be updated (mostly
context). We are able to drop the selinux related change as RSS
prevents the situation this was working around from happenning.
This was validated using https://criu.org/Simple_loop (and a few
variants).
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/criu/files/disable-selinux.patch')
| -rw-r--r-- | recipes-containers/criu/files/disable-selinux.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/recipes-containers/criu/files/disable-selinux.patch b/recipes-containers/criu/files/disable-selinux.patch deleted file mode 100644 index 5d5d0352..00000000 --- a/recipes-containers/criu/files/disable-selinux.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From bd2eeaddfc1f12f87184d870cc9a1adde1cf0b10 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
| 3 | Date: Mon, 24 Apr 2017 13:08:48 -0400 | ||
| 4 | Subject: [PATCH] criu/Makefile.config: explicitly remove selinux support | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [disable feature] | ||
| 7 | |||
| 8 | It shows warning when build crius if libselinux has been built already: | ||
| 9 | |||
| 10 | WARNING: QA Issue: criu rdepends on libselinux, but it isn't a build dependency? [build-deps] | ||
| 11 | |||
| 12 | Apply this patch to disable selinux support when 'selinux' is not in PACKAGECONF. | ||
| 13 | |||
| 14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 15 | [MA: Context updated to apply against criu v2.5] | ||
| 16 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
| 17 | --- | ||
| 18 | criu/Makefile.config | 5 ----- | ||
| 19 | 1 file changed, 5 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/criu/Makefile.config b/criu/Makefile.config | ||
| 22 | index f531b3b..37216f8 100644 | ||
| 23 | --- a/criu/Makefile.config | ||
| 24 | +++ b/criu/Makefile.config | ||
| 25 | @@ -7,11 +7,6 @@ ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) | ||
| 26 | FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD | ||
| 27 | endif | ||
| 28 | |||
| 29 | -ifeq ($(call pkg-config-check,libselinux),y) | ||
| 30 | - LIBS += -lselinux | ||
| 31 | - FEATURE_DEFINES += -DCONFIG_HAS_SELINUX | ||
| 32 | -endif | ||
| 33 | - | ||
| 34 | export DEFINES += $(FEATURE_DEFINES) | ||
| 35 | export CFLAGS += $(FEATURE_DEFINES) | ||
| 36 | |||
| 37 | -- | ||
| 38 | 2.7.4 | ||
| 39 | |||
