diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch b/import-layers/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch new file mode 100644 index 000000000..389af1e07 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch @@ -0,0 +1,53 @@ +From c02354af7f3d9426da31503abfae70952c699a9d Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Fri, 18 Mar 2016 03:23:11 -0400 +Subject: [PATCH] configure: fix with/without selinux + +Problem: +without-selinux doesn't work since WITH_SELINUX is always be defined no +matter which option is given: with-selinux, without-selinux. + +Fix: +Disable selinux support if without-selinux is given; otherwise check +libselinux to determine if selinux support should be enabled. + +Upstream-Status: Submitted [at@packages.debian.org] + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + configure.ac | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5a43419..8c9de62 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -240,10 +240,21 @@ AC_ARG_WITH(daemon_username, + AC_SUBST(DAEMON_USERNAME) + + AC_ARG_WITH(selinux, +-[ --with-selinux Define to run with selinux], +-AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux]), +-) +-AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux) ++[ --with-selinux Define to run with selinux (default=check)], ++[], ++[with_selinux=check]) ++ ++if test "x$with_selinux" != xno; then ++ AC_CHECK_LIB([selinux], [is_selinux_enabled], ++ [SELINUXLIB=-lselinux ++ AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux]) ++ ], ++ [if test "x$with_selinux" != xcheck; then ++ AC_MSG_FAILURE([--with-selinux is given, but test for selinux failed]) ++ fi ++ ] ++ ) ++fi + AC_SUBST(SELINUXLIB) + AC_SUBST(WITH_SELINUX) + +-- +1.9.1 + |