commit:     267fec5485ba817987ca1e420f1093071c66e6dc
Author:     Chris PeBenito <cpebenito <AT> tresys <DOT> com>
AuthorDate: Tue Oct 20 19:01:23 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 03:34:52 2015 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=267fec54

Add systemd build option.

 Makefile               | 5 +++++
 build.conf             | 4 ++++
 support/Makefile.devel | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/Makefile b/Makefile
index 09fae9d..1bc69a1 100644
--- a/Makefile
+++ b/Makefile
@@ -192,6 +192,10 @@ ifeq "$(DISTRO)" "ubuntu"
        M4PARAM += -D distro_debian
 endif
 
+ifeq "$(SYSTEMD)" "y"
+       M4PARAM += -D init_systemd
+endif
+
 ifneq ($(OUTPUT_POLICY),)
        CHECKPOLICY += -c $(OUTPUT_POLICY)
 endif
@@ -524,6 +528,7 @@ ifneq "$(DISTRO)" ""
 endif
        $(verbose) echo "MONOLITHIC ?= n" >> $(headerdir)/build.conf
        $(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> 
$(headerdir)/build.conf
+       $(verbose) echo "SYSTEMD ?= $(SYSTEMD)" >> $(headerdir)/build.conf
        $(verbose) echo "override UBAC := $(UBAC)" >> $(headerdir)/build.conf
        $(verbose) echo "override MLS_SENS := $(MLS_SENS)" >> 
$(headerdir)/build.conf
        $(verbose) echo "override MLS_CATS := $(MLS_CATS)" >> 
$(headerdir)/build.conf

diff --git a/build.conf b/build.conf
index 0fffc2a..087d952 100644
--- a/build.conf
+++ b/build.conf
@@ -44,6 +44,10 @@ UNK_PERMS = deny
 # not work in conditional policy.
 DIRECT_INITRC = n
 
+# Systemd
+# Setting this will configure systemd as the init system.
+SYSTEMD = n
+
 # Build monolithic policy.  Putting y here
 # will build a monolithic policy.
 MONOLITHIC = n

diff --git a/support/Makefile.devel b/support/Makefile.devel
index ae52932..d1cbef9 100644
--- a/support/Makefile.devel
+++ b/support/Makefile.devel
@@ -58,6 +58,10 @@ ifneq ($(DISTRO),)
        M4PARAM += -D distro_$(DISTRO)
 endif
 
+ifeq "$(SYSTEMD)" "y"
+       M4PARAM += -D init_systemd
+endif
+
 ifeq ($(DIRECT_INITRC),y)
        M4PARAM += -D direct_sysadm_daemon
 endif

Reply via email to