From patchwork Fri Jan 9 14:18:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 427079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id AF7201401B5 for ; Sat, 10 Jan 2015 01:19:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 78CE28BDC9; Fri, 9 Jan 2015 14:19:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ts9TQgBT2yC4; Fri, 9 Jan 2015 14:19:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 81D858B97B; Fri, 9 Jan 2015 14:18:59 +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 C4AB01C1E95 for ; Fri, 9 Jan 2015 14:18:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B87738AB1E for ; Fri, 9 Jan 2015 14:18:47 +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 3xh3ynoLkAjC for ; Fri, 9 Jan 2015 14:18:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs01.rockwellcollins.com (ch3vs01.rockwellcollins.com [205.175.226.27]) by whitealder.osuosl.org (Postfix) with ESMTPS id F0C0E8AA78 for ; Fri, 9 Jan 2015 14:18:43 +0000 (UTC) Received: from ofwch3n02.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.226.14]) by ch3vs01.rockwellcollins.com with ESMTP; 09 Jan 2015 08:18:43 -0600 X-Received: from smtplb.rockwellcollins.com (smtplb.rockwellcollins.com [131.198.63.134]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id 49C4060842; Fri, 9 Jan 2015 08:18:43 -0600 (CST) X-Received: from largo.rockwellcollins.com (unknown [192.168.140.76]) by smtplb.rockwellcollins.com (Postfix) with ESMTP id 3DAF1801E8; Fri, 9 Jan 2015 08:18:43 -0600 (CST) From: Matt Weber To: buildroot@busybox.net Date: Fri, 9 Jan 2015 08:18:31 -0600 Message-Id: <1420813120-50848-19-git-send-email-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420813120-50848-1-git-send-email-matthew.weber@rockwellcollins.com> References: <1420813120-50848-1-git-send-email-matthew.weber@rockwellcollins.com> Subject: [Buildroot] [PATCH v3 18/27] sysvinit: added libselinux dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Signed-off-by: Matthew Weber --- .../sysvinit-0010-fix-WITH-SELINUX-define.patch | 24 ++++++++++++++++++++++ package/sysvinit/sysvinit.mk | 11 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 package/sysvinit/sysvinit-0010-fix-WITH-SELINUX-define.patch diff --git a/package/sysvinit/sysvinit-0010-fix-WITH-SELINUX-define.patch b/package/sysvinit/sysvinit-0010-fix-WITH-SELINUX-define.patch new file mode 100644 index 0000000..4d9c10a --- /dev/null +++ b/package/sysvinit/sysvinit-0010-fix-WITH-SELINUX-define.patch @@ -0,0 +1,24 @@ +--- a/src/Makefile 2010-04-11 04:30:27.000000000 -0500 ++++ b/src/Makefile 2014-09-16 14:07:31.404952266 -0500 +@@ -104,7 +104,7 @@ + + runlevel: runlevel.o + +-sulogin: LDLIBS += $(SULOGINLIBS) $(STATIC) ++sulogin: LDLIBS += $(SULOGINLIBS) $(INITLIBS) $(STATIC) + sulogin: sulogin.o + + wall: dowall.o wall.o +@@ -114,10 +115,10 @@ + bootlogd: LDLIBS += -lutil + bootlogd: bootlogd.o + +-sulogin.o: CPPFLAGS += $(SELINUX_DEF) ++sulogin.o: CFLAGS += $(SELINUX_DEF) + sulogin.o: sulogin.c + +-init.o: CPPFLAGS += $(SELINUX_DEF) ++init.o: CFLAGS += $(SELINUX_DEF) + init.o: init.c init.h set.h reboot.h initreq.h + + utmp.o: utmp.c init.h diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index 53640a4..253ea9b 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -13,7 +13,16 @@ SYSVINIT_LICENSE_FILES = COPYING # Override BusyBox implementations if BusyBox is enabled. ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSVINIT_DEPENDENCIES = busybox +SYSVINIT_DEPENDENCIES += busybox +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +SYSVINIT_DEPENDENCIES += libselinux +TARGET_CONFIGURE_OPTS += WITH_SELINUX="yes" ROOT="$(TARGET_DIR)" +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +TARGET_CONFIGURE_OPTS += WITH_SELINUX="yes" ROOT="$(TARGET_DIR)" endif define SYSVINIT_DEBIAN_PATCHES