diff options
| -rw-r--r-- | recipes-containers/criu/files/disable-selinux.patch | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/recipes-containers/criu/files/disable-selinux.patch b/recipes-containers/criu/files/disable-selinux.patch index da881dd3..5d5d0352 100644 --- a/recipes-containers/criu/files/disable-selinux.patch +++ b/recipes-containers/criu/files/disable-selinux.patch | |||
| @@ -1,3 +1,8 @@ | |||
| 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 | |||
| 1 | Upstream-Status: Inappropriate [disable feature] | 6 | Upstream-Status: Inappropriate [disable feature] |
| 2 | 7 | ||
| 3 | It shows warning when build crius if libselinux has been built already: | 8 | 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: | |||
| 7 | Apply this patch to disable selinux support when 'selinux' is not in PACKAGECONF. | 12 | Apply this patch to disable selinux support when 'selinux' is not in PACKAGECONF. |
| 8 | 13 | ||
| 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 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(-) | ||
| 10 | 20 | ||
| 11 | diff --git a/Makefile.config b/Makefile.config | 21 | diff --git a/criu/Makefile.config b/criu/Makefile.config |
| 12 | index ce4b8d8..3ac2780 100644 | 22 | index f531b3b..37216f8 100644 |
| 13 | --- a/Makefile.config | 23 | --- a/criu/Makefile.config |
| 14 | +++ b/Makefile.config | 24 | +++ b/criu/Makefile.config |
| 15 | @@ -8,11 +8,6 @@ ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y) | 25 | @@ -7,11 +7,6 @@ ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true) |
| 16 | DEFINES += -DCONFIG_HAS_LIBBSD | 26 | FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD |
| 17 | endif | 27 | endif |
| 18 | 28 | ||
| 19 | -ifeq ($(call pkg-config-check,libselinux),y) | 29 | -ifeq ($(call pkg-config-check,libselinux),y) |
| 20 | - LIBS := -lselinux $(LIBS) | 30 | - LIBS += -lselinux |
| 21 | - DEFINES += -DCONFIG_HAS_SELINUX | 31 | - FEATURE_DEFINES += -DCONFIG_HAS_SELINUX |
| 22 | -endif | 32 | -endif |
| 23 | - | 33 | - |
| 24 | $(CONFIG): scripts/utilities.mak scripts/feature-tests.mak include/config-base.h | 34 | export DEFINES += $(FEATURE_DEFINES) |
| 25 | $(E) " GEN " $@ | 35 | export CFLAGS += $(FEATURE_DEFINES) |
| 26 | $(Q) @echo '#ifndef __CR_CONFIG_H__' > $@ | 36 | |
| 37 | -- | ||
| 38 | 2.7.4 | ||
| 39 | |||