summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-04-21 14:37:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-12 08:49:29 +0100
commit860e9c7d5653deb31dc0f1b0ea55c8e2a843d2fa (patch)
treed0a2bdceadb5b8fc1e74bfd9543183ef0ef70e21 /meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
parentf59039820389cef334fa50d879e9a14d88ac8fb6 (diff)
downloadopenembedded-core-860e9c7d5653deb31dc0f1b0ea55c8e2a843d2fa.tar.gz
coreutils: don't use version-specific patch directory
As we only ship one version of coreutils, having this directory be versioned just complicates upgrades. Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch')
-rw-r--r--meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
new file mode 100644
index 0000000000..9d1ae55d47
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
@@ -0,0 +1,39 @@
+From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 16 Sep 2014 01:59:08 -0700
+Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
+ with_selinux
+
+Fixed when build with meta-selinux even when --without-selinux:
+runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory
+ # include <selinux/flask.h>
+ ^
+compilation terminated.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ m4/gnulib-comp.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
+index 472d3a0..5f09734 100644
+--- a/m4/gnulib-comp.m4
++++ b/m4/gnulib-comp.m4
+@@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT],
+ AC_LIBOBJ([select])
+ fi
+ gl_SYS_SELECT_MODULE_INDICATOR([select])
+- AC_CHECK_HEADERS([selinux/flask.h])
+ AC_LIBOBJ([selinux-at])
+ gl_HEADERS_SELINUX_SELINUX_H
+ gl_HEADERS_SELINUX_CONTEXT_H
+ if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
++ AC_CHECK_HEADERS([selinux/flask.h])
+ AC_LIBOBJ([getfilecon])
+ fi
+ gl_SERVENT
+--
+1.7.9.5
+