From f2259701a5b6a3693203cca8e0d5ce0969b56be3 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 16 Sep 2014 02:40:02 -0700 Subject: [PATCH] coreutils: selinux/flask.h should respect to with_selinux Fixed when build with meta-selinux even with --without-selinux: runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory # include ^ compilation terminated. (From OE-Core rev: d52a606c8a75496f3b7239adc19fdb66e3ae576a) Signed-off-by: Robert Yang Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../coreutils-8.22/fix-selinux-flask.patch | 39 ++++++++++++++++++++++ meta/recipes-core/coreutils/coreutils_8.22.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch new file mode 100644 index 0000000..9d1ae55 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch @@ -0,0 +1,39 @@ +From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001 +From: Robert Yang +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 + ^ +compilation terminated. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + 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 + diff --git a/meta/recipes-core/coreutils/coreutils_8.22.bb b/meta/recipes-core/coreutils/coreutils_8.22.bb index 83f7861..6239600 100644 --- a/meta/recipes-core/coreutils/coreutils_8.22.bb +++ b/meta/recipes-core/coreutils/coreutils_8.22.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ file://dummy_help2man.patch \ file://fix-for-dummy-man-usage.patch \ + file://fix-selinux-flask.patch \ " SRC_URI[md5sum] = "8fb0ae2267aa6e728958adc38f8163a2" -- 2.7.4