commit: c47e5c0bc2b6d37dc78dab7bceeb64f665a10879
Author: David Sugar <dsugar <AT> tresys <DOT> com>
AuthorDate: Sat Oct 27 16:13:32 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 23:17:31 2018 +0000
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=c47e5c0b
Update CUSTOM_BUILDOPT
Have Makefile include CUSTOM_BUILDOPT in generated build.conf
Update Makefile.devel to pass CUSTOM_BUILDOPT while building module
Signed-off-by: Dave Sugar <dsugar <AT> tresys.com>
Signed-off-by: Jason Zaman <jason <AT> perfinion.com>
Makefile | 1 +
support/Makefile.devel | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/Makefile b/Makefile
index 413656bb..dba38fc4 100644
--- a/Makefile
+++ b/Makefile
@@ -547,6 +547,7 @@ 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 "CUSTOM_BUILDOPT ?= $(CUSTOM_BUILDOPT)" >>
$(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/support/Makefile.devel b/support/Makefile.devel
index bcca2d98..f3daca11 100644
--- a/support/Makefile.devel
+++ b/support/Makefile.devel
@@ -70,6 +70,10 @@ ifeq "$(UBAC)" "y"
M4PARAM += -D enable_ubac
endif
+ifneq "$(CUSTOM_BUILDOPT)" ""
+ M4PARAM += $(foreach opt,$(CUSTOM_BUILDOPT),-D $(opt))
+endif
+
# default MLS/MCS sensitivity and category settings.
MLS_SENS ?= 16
MLS_CATS ?= 1024
