diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/criu/files/disable-selinux.patch')
| -rw-r--r-- | import-layers/meta-virtualization/recipes-containers/criu/files/disable-selinux.patch | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/criu/files/disable-selinux.patch b/import-layers/meta-virtualization/recipes-containers/criu/files/disable-selinux.patch index da881dd377..5d5d03526e 100644 --- a/import-layers/meta-virtualization/recipes-containers/criu/files/disable-selinux.patch +++ b/import-layers/meta-virtualization/recipes-containers/criu/files/disable-selinux.patch @@ -1,3 +1,8 @@ +From bd2eeaddfc1f12f87184d870cc9a1adde1cf0b10 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Mon, 24 Apr 2017 13:08:48 -0400 +Subject: [PATCH] criu/Makefile.config: explicitly remove selinux support + Upstream-Status: Inappropriate [disable feature] It shows warning when build crius if libselinux has been built already: @@ -7,20 +12,28 @@ It shows warning when build crius if libselinux has been built already: Apply this patch to disable selinux support when 'selinux' is not in PACKAGECONF. Signed-off-by: Kai Kang <kai.kang@windriver.com> +[MA: Context updated to apply against criu v2.5] +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + criu/Makefile.config | 5 ----- + 1 file changed, 5 deletions(-) -diff --git a/Makefile.config b/Makefile.config -index ce4b8d8..3ac2780 100644 ---- a/Makefile.config -+++ b/Makefile.config -@@ -8,11 +8,6 @@ ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y) - DEFINES += -DCONFIG_HAS_LIBBSD +diff --git a/criu/Makefile.config b/criu/Makefile.config +index f531b3b..37216f8 100644 +--- a/criu/Makefile.config ++++ b/criu/Makefile.config +@@ -7,11 +7,6 @@ ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) + FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD endif -ifeq ($(call pkg-config-check,libselinux),y) -- LIBS := -lselinux $(LIBS) -- DEFINES += -DCONFIG_HAS_SELINUX +- LIBS += -lselinux +- FEATURE_DEFINES += -DCONFIG_HAS_SELINUX -endif - - $(CONFIG): scripts/utilities.mak scripts/feature-tests.mak include/config-base.h - $(E) " GEN " $@ - $(Q) @echo '#ifndef __CR_CONFIG_H__' > $@ + export DEFINES += $(FEATURE_DEFINES) + export CFLAGS += $(FEATURE_DEFINES) + +-- +2.7.4 + |