From da160ef9102274425602d326bfe8386469f9bbb3 Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Thu, 21 Jun 2012 15:12:28 +0800 Subject: util-linux: Support selinux Add the selinux support for util-linux. Signed-off-by: Xiaofeng Yan Signed-off-by: Xin Ouyang --- .../util-linux/util-linux/util-linux-selinux.patch | 14 ++++++++++++++ recipes-core/util-linux/util-linux_2.21.1.bbappend | 10 ++++++++++ 2 files changed, 24 insertions(+) create mode 100644 recipes-core/util-linux/util-linux/util-linux-selinux.patch create mode 100644 recipes-core/util-linux/util-linux_2.21.1.bbappend 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 @@ + +Upstream-Status: pending +Signed-Off-By: Xiaofeng Yan +--- util-linux-2.21.1/libmount/src/Makefile.am 2012-03-29 21:11:14.456615759 +0800 ++++ util-linux-2.21.1/libmount/src/Makefile.am.new 2012-06-21 11:02:39.971163392 +0800 +@@ -30,7 +30,7 @@ + + libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS) + +-libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) libmount.sym libmount.h.in ++libmount_la_DEPENDENCIES = $(ul_libblkid_la) libmount.sym libmount.h.in + + libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/libmount.sym \ + -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 @@ +PR .= ".1" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://util-linux-selinux.patch \ + " +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" + -- cgit v1.2.3-54-g00ecf