| 1 |
commit: 267fec5485ba817987ca1e420f1093071c66e6dc |
| 2 |
Author: Chris PeBenito <cpebenito <AT> tresys <DOT> com> |
| 3 |
AuthorDate: Tue Oct 20 19:01:23 2015 +0000 |
| 4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 26 03:34:52 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=267fec54 |
| 7 |
|
| 8 |
Add systemd build option. |
| 9 |
|
| 10 |
Makefile | 5 +++++ |
| 11 |
build.conf | 4 ++++ |
| 12 |
support/Makefile.devel | 4 ++++ |
| 13 |
3 files changed, 13 insertions(+) |
| 14 |
|
| 15 |
diff --git a/Makefile b/Makefile |
| 16 |
index 09fae9d..1bc69a1 100644 |
| 17 |
--- a/Makefile |
| 18 |
+++ b/Makefile |
| 19 |
@@ -192,6 +192,10 @@ ifeq "$(DISTRO)" "ubuntu" |
| 20 |
M4PARAM += -D distro_debian |
| 21 |
endif |
| 22 |
|
| 23 |
+ifeq "$(SYSTEMD)" "y" |
| 24 |
+ M4PARAM += -D init_systemd |
| 25 |
+endif |
| 26 |
+ |
| 27 |
ifneq ($(OUTPUT_POLICY),) |
| 28 |
CHECKPOLICY += -c $(OUTPUT_POLICY) |
| 29 |
endif |
| 30 |
@@ -524,6 +528,7 @@ ifneq "$(DISTRO)" "" |
| 31 |
endif |
| 32 |
$(verbose) echo "MONOLITHIC ?= n" >> $(headerdir)/build.conf |
| 33 |
$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(headerdir)/build.conf |
| 34 |
+ $(verbose) echo "SYSTEMD ?= $(SYSTEMD)" >> $(headerdir)/build.conf |
| 35 |
$(verbose) echo "override UBAC := $(UBAC)" >> $(headerdir)/build.conf |
| 36 |
$(verbose) echo "override MLS_SENS := $(MLS_SENS)" >> $(headerdir)/build.conf |
| 37 |
$(verbose) echo "override MLS_CATS := $(MLS_CATS)" >> $(headerdir)/build.conf |
| 38 |
|
| 39 |
diff --git a/build.conf b/build.conf |
| 40 |
index 0fffc2a..087d952 100644 |
| 41 |
--- a/build.conf |
| 42 |
+++ b/build.conf |
| 43 |
@@ -44,6 +44,10 @@ UNK_PERMS = deny |
| 44 |
# not work in conditional policy. |
| 45 |
DIRECT_INITRC = n |
| 46 |
|
| 47 |
+# Systemd |
| 48 |
+# Setting this will configure systemd as the init system. |
| 49 |
+SYSTEMD = n |
| 50 |
+ |
| 51 |
# Build monolithic policy. Putting y here |
| 52 |
# will build a monolithic policy. |
| 53 |
MONOLITHIC = n |
| 54 |
|
| 55 |
diff --git a/support/Makefile.devel b/support/Makefile.devel |
| 56 |
index ae52932..d1cbef9 100644 |
| 57 |
--- a/support/Makefile.devel |
| 58 |
+++ b/support/Makefile.devel |
| 59 |
@@ -58,6 +58,10 @@ ifneq ($(DISTRO),) |
| 60 |
M4PARAM += -D distro_$(DISTRO) |
| 61 |
endif |
| 62 |
|
| 63 |
+ifeq "$(SYSTEMD)" "y" |
| 64 |
+ M4PARAM += -D init_systemd |
| 65 |
+endif |
| 66 |
+ |
| 67 |
ifeq ($(DIRECT_INITRC),y) |
| 68 |
M4PARAM += -D direct_sysadm_daemon |
| 69 |
endif |
Archives