diff options
author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2012-06-21 15:12:28 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-06-25 10:18:34 +0800 |
commit | da160ef9102274425602d326bfe8386469f9bbb3 (patch) | |
tree | 6c57052b6ef43643bf3825503d934e2876e34f5e | |
parent | df354a213e616f5ce2b10e717cd03a627bf34c55 (diff) | |
download | meta-selinux-da160ef9102274425602d326bfe8386469f9bbb3.tar.gz |
util-linux: Support selinux
Add the selinux support for util-linux.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
-rw-r--r-- | recipes-core/util-linux/util-linux/util-linux-selinux.patch | 14 | ||||
-rw-r--r-- | recipes-core/util-linux/util-linux_2.21.1.bbappend | 10 |
2 files changed, 24 insertions, 0 deletions
diff --git a/recipes-core/util-linux/util-linux/util-linux-selinux.patch b/recipes-core/util-linux/util-linux/util-linux-selinux.patch new file mode 100644 index 0000000..a10d464 --- /dev/null +++ b/recipes-core/util-linux/util-linux/util-linux-selinux.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | |||
2 | Upstream-Status: pending | ||
3 | Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
4 | --- util-linux-2.21.1/libmount/src/Makefile.am 2012-03-29 21:11:14.456615759 +0800 | ||
5 | +++ util-linux-2.21.1/libmount/src/Makefile.am.new 2012-06-21 11:02:39.971163392 +0800 | ||
6 | @@ -30,7 +30,7 @@ | ||
7 | |||
8 | libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS) | ||
9 | |||
10 | -libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) libmount.sym libmount.h.in | ||
11 | +libmount_la_DEPENDENCIES = $(ul_libblkid_la) libmount.sym libmount.h.in | ||
12 | |||
13 | libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/libmount.sym \ | ||
14 | -version-info $(LIBMOUNT_VERSION_INFO) | ||
diff --git a/recipes-core/util-linux/util-linux_2.21.1.bbappend b/recipes-core/util-linux/util-linux_2.21.1.bbappend new file mode 100644 index 0000000..b9a09b5 --- /dev/null +++ b/recipes-core/util-linux/util-linux_2.21.1.bbappend | |||
@@ -0,0 +1,10 @@ | |||
1 | PR .= ".1" | ||
2 | |||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
4 | |||
5 | SRC_URI += "file://util-linux-selinux.patch \ | ||
6 | " | ||
7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | ||
8 | |||
9 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
10 | |||