From patchwork Fri Sep 6 01:04:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 273010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 71C7E2C00BC for ; Fri, 6 Sep 2013 11:04:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 248F79393C; Fri, 6 Sep 2013 01:05:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 295RJCISqNlT; Fri, 6 Sep 2013 01:05:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8FA9C937E7; Fri, 6 Sep 2013 01:05:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CD2741BFA8B for ; Fri, 6 Sep 2013 01:04:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C7F208CAC4 for ; Fri, 6 Sep 2013 01:04:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RaA345By+9+e for ; Fri, 6 Sep 2013 01:04:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs01.rockwellcollins.com (secvs01.rockwellcollins.com [205.175.225.240]) by whitealder.osuosl.org (Postfix) with ESMTPS id F39B98B7C9 for ; Fri, 6 Sep 2013 01:04:44 +0000 (UTC) Received: from nosuchhost.198.131.in-addr.arpa (HELO collinscrsmtp02.rockwellcollins.com) ([131.198.63.133]) by mail-virt.rockwellcollins.com with ESMTP; 05 Sep 2013 20:04:44 -0500 Received: from ares ([131.198.63.11]) by collinscrsmtp02.rockwellcollins.com (Lotus Domino Release 8.5.2FP2 HF162) with ESMTP id 2013090520044379-751719 ; Thu, 5 Sep 2013 20:04:43 -0500 From: Ryan Barnett To: buildroot@busybox.net Date: Thu, 5 Sep 2013 20:04:18 -0500 Message-Id: <1378429464-12546-5-git-send-email-rjbarnet@rockwellcollins.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1378429464-12546-1-git-send-email-rjbarnet@rockwellcollins.com> References: <1378429464-12546-1-git-send-email-rjbarnet@rockwellcollins.com> X-MIMETrack: Itemize by SMTP Server on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 09/05/2013 08:04:44 PM, Serialize by Router on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 09/05/2013 08:04:44 PM, Serialize complete at 09/05/2013 08:04:44 PM X-TNEFEvaluated: 1 Subject: [Buildroot] [PATCH 04/10] util-linux: add suport for SELinux X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Added patch to fix the LDFLAGS for libmount to support SELinux. Cleaning up the naming of the util-linux patches. Signed-off-by: Ryan Barnett --- ...-linux-002-program-invocation-short-name.patch} | 0 .../util-linux-003-libmount-libselinux-fix.patch | 21 ++++++++++++++++++++ package/util-linux/util-linux.mk | 21 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) rename package/util-linux/{util-linux-003-program-invocation-short-name.patch => util-linux-002-program-invocation-short-name.patch} (100%) create mode 100644 package/util-linux/util-linux-003-libmount-libselinux-fix.patch diff --git a/package/util-linux/util-linux-003-program-invocation-short-name.patch b/package/util-linux/util-linux-002-program-invocation-short-name.patch similarity index 100% rename from package/util-linux/util-linux-003-program-invocation-short-name.patch rename to package/util-linux/util-linux-002-program-invocation-short-name.patch diff --git a/package/util-linux/util-linux-003-libmount-libselinux-fix.patch b/package/util-linux/util-linux-003-libmount-libselinux-fix.patch new file mode 100644 index 0000000..2c925bf --- /dev/null +++ b/package/util-linux/util-linux-003-libmount-libselinux-fix.patch @@ -0,0 +1,21 @@ +diff -urN a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am +--- a/libmount/src/Makemodule.am 2012-10-15 05:09:42.390129040 -0500 ++++ b/libmount/src/Makemodule.am 2013-07-12 09:25:11.000000000 -0500 +@@ -30,7 +30,7 @@ + + nodist_libmount_la_SOURCES = libmount/src/mountP.h + +-libmount_la_LIBADD = libcommon.la libblkid.la $(SELINUX_LIBS) ++libmount_la_LIBADD = libcommon.la libblkid.la + + libmount_la_CFLAGS = \ + -I$(ul_libblkid_incdir) \ +@@ -44,7 +44,7 @@ + + libmount_la_LDFLAGS = \ + -Wl,--version-script=$(top_srcdir)/libmount/src/libmount.sym \ +- -version-info $(LIBMOUNT_VERSION_INFO) ++ -version-info $(LIBMOUNT_VERSION_INFO) $(SELINUX_LIBS) + + EXTRA_DIST += \ + libmount/src/libmount.sym \ diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 6f79e74..b1ff992 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -40,6 +40,27 @@ UTIL_LINUX_DEPENDENCIES += gettext UTIL_LINUX_MAKE_OPT += LIBS=-lintl endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +UTIL_LINUX_DEPENDENCIES += libselinux +UTIL_LINUX_CONF_OPT += --with-selinux +else +UTIL_LINUX_CONF_OPT += --without-selinux +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +UTIL_LINUX_DEPENDENCIES += linux-pam +UTIL_LINUX_CONF_OPT += --with-pam +else +UTIL_LINUX_CONF_OPT += --without-pam +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +UTIL_LINUX_DEPENDENCIES += audit +UTIL_LINUX_CONF_OPT += --with-audit +else +UTIL_LINUX_CONF_OPT += --without-audit +endif + # Used by cramfs utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib)