summaryrefslogtreecommitdiffstats
path: root/recipes-containers/criu/files/disable-selinux.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/criu/files/disable-selinux.patch')
-rw-r--r--recipes-containers/criu/files/disable-selinux.patch39
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 @@
1From bd2eeaddfc1f12f87184d870cc9a1adde1cf0b10 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Mon, 24 Apr 2017 13:08:48 -0400
4Subject: [PATCH] criu/Makefile.config: explicitly remove selinux support
5
6Upstream-Status: Inappropriate [disable feature]
7
8It 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
12Apply this patch to disable selinux support when 'selinux' is not in PACKAGECONF.
13
14Signed-off-by: Kai Kang <kai.kang@windriver.com>
15[MA: Context updated to apply against criu v2.5]
16Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
17---
18 criu/Makefile.config | 5 -----
19 1 file changed, 5 deletions(-)
20
21diff --git a/criu/Makefile.config b/criu/Makefile.config
22index 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--
382.7.4
39