| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 | |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 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> |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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(-) |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 20 | |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 27 | endif |
| 28 | |
| 29 | -ifeq ($(call pkg-config-check,libselinux),y) |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 30 | - LIBS += -lselinux |
| 31 | - FEATURE_DEFINES += -DCONFIG_HAS_SELINUX |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 32 | -endif |
| 33 | - |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 34 | export DEFINES += $(FEATURE_DEFINES) |
| 35 | export CFLAGS += $(FEATURE_DEFINES) |
| 36 | |
| 37 | -- |
| 38 | 2.7.4 |
| 39 | |