From patchwork Fri Sep 6 01:04:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 273016 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 EF1212C00BC for ; Fri, 6 Sep 2013 11:05:13 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B2BDD93978; Fri, 6 Sep 2013 01:06:05 +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 RKY1ntuQSbhy; Fri, 6 Sep 2013 01:06:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B43F393917; Fri, 6 Sep 2013 01:06:03 +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 3B2A61BFA8B for ; Fri, 6 Sep 2013 01:05:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 355CB8C00B for ; Fri, 6 Sep 2013 01:05:08 +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 WJkx8+2vFWRf for ; Fri, 6 Sep 2013 01:05:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs02.rockwellcollins.com (secvs02.rockwellcollins.com [205.175.225.241]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8DDF08B7C9 for ; Fri, 6 Sep 2013 01:05:07 +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:05:07 -0500 Received: from ares ([131.198.63.11]) by collinscrsmtp02.rockwellcollins.com (Lotus Domino Release 8.5.2FP2 HF162) with ESMTP id 2013090520050719-751732 ; Thu, 5 Sep 2013 20:05:07 -0500 From: Ryan Barnett To: buildroot@busybox.net Date: Thu, 5 Sep 2013 20:04:24 -0500 Message-Id: <1378429464-12546-11-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:05:07 PM, Serialize by Router on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 09/05/2013 08:05:07 PM, Serialize complete at 09/05/2013 08:05:07 PM X-TNEFEvaluated: 1 Subject: [Buildroot] [PATCH 10/10] busybox: add support 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 Adding support to build libselinux before busybox if libselinux is selected. Busybox needs the headers to compile correctly if SELinux support is enabled in the busybox configuration. Adding patch to fix issue with busybox not properly pulling in libraries. Signed-off-by: Ryan Barnett --- .../busybox/1.21.1/busybox-1.21.1-pkg-config.patch | 13 +++++++++++++ package/busybox/busybox.mk | 6 ++++++ 2 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 package/busybox/1.21.1/busybox-1.21.1-pkg-config.patch diff --git a/package/busybox/1.21.1/busybox-1.21.1-pkg-config.patch b/package/busybox/1.21.1/busybox-1.21.1-pkg-config.patch new file mode 100644 index 0000000..79b8681 --- /dev/null +++ b/package/busybox/1.21.1/busybox-1.21.1-pkg-config.patch @@ -0,0 +1,13 @@ +# Need to have the pkg-config only spit out the libs and not the lib path +# also when checking for the SELinux libraries. +--- a/Makefile.flags 2013-05-11 18:30:43.000000000 -0500 ++++ b/Makefile.flags 2013-08-27 09:40:05.082917005 -0500 +@@ -81,7 +81,7 @@ + # Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES)) + define pkg_check_modules + $(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2)) +-$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2)) ++$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs-only-l $(2)) + endef + + ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ad8bdaf..fd24ffd 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -31,6 +31,12 @@ BUSYBOX_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/ BUSYBOX_CFLAGS_busybox += -ltirpc endif +# For SELinux, enable the SELinux flag CONFIG_SELINUX +# in the busybox config +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +BUSYBOX_DEPENDENCIES += libselinux +endif + BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config # Allows the build system to tweak CFLAGS BUSYBOX_MAKE_ENV = \