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:51:09 +0100
commit0903700ea82b9e3eec9ae59c990a377433dfa4a1 (patch)
treec9e5598e21a309abc0ab05c7471c02a401ee84b0 /meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
parent485e8a3e9e8f5afb84caf01b08e88a7ffafc2104 (diff)
downloadpoky-0903700ea82b9e3eec9ae59c990a377433dfa4a1.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. (From OE-Core rev: 860e9c7d5653deb31dc0f1b0ea55c8e2a843d2fa) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@
1From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 16 Sep 2014 01:59:08 -0700
4Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
5 with_selinux
6
7Fixed when build with meta-selinux even when --without-selinux:
8runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory
9 # include <selinux/flask.h>
10 ^
11compilation terminated.
12
13Upstream-Status: Pending
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 m4/gnulib-comp.m4 | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
21index 472d3a0..5f09734 100644
22--- a/m4/gnulib-comp.m4
23+++ b/m4/gnulib-comp.m4
24@@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT],
25 AC_LIBOBJ([select])
26 fi
27 gl_SYS_SELECT_MODULE_INDICATOR([select])
28- AC_CHECK_HEADERS([selinux/flask.h])
29 AC_LIBOBJ([selinux-at])
30 gl_HEADERS_SELINUX_SELINUX_H
31 gl_HEADERS_SELINUX_CONTEXT_H
32 if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
33+ AC_CHECK_HEADERS([selinux/flask.h])
34 AC_LIBOBJ([getfilecon])
35 fi
36 gl_SERVENT
37--
381.7.9.5
39