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@tresys.com>
This commit is contained in:
David Sugar 2018-10-27 16:13:32 +00:00 committed by Chris PeBenito
parent 9dd80c6a67
commit 8e18a55457
2 changed files with 5 additions and 0 deletions

View File

@ -545,6 +545,7 @@ endif
$(verbose) echo "MONOLITHIC ?= n" >> $(headerdir)/build.conf $(verbose) echo "MONOLITHIC ?= n" >> $(headerdir)/build.conf
$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(headerdir)/build.conf $(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(headerdir)/build.conf
$(verbose) echo "SYSTEMD ?= $(SYSTEMD)" >> $(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 UBAC := $(UBAC)" >> $(headerdir)/build.conf
$(verbose) echo "override MLS_SENS := $(MLS_SENS)" >> $(headerdir)/build.conf $(verbose) echo "override MLS_SENS := $(MLS_SENS)" >> $(headerdir)/build.conf
$(verbose) echo "override MLS_CATS := $(MLS_CATS)" >> $(headerdir)/build.conf $(verbose) echo "override MLS_CATS := $(MLS_CATS)" >> $(headerdir)/build.conf

View File

@ -70,6 +70,10 @@ ifeq "$(UBAC)" "y"
M4PARAM += -D enable_ubac M4PARAM += -D enable_ubac
endif endif
ifneq "$(CUSTOM_BUILDOPT)" ""
M4PARAM += $(foreach opt,$(CUSTOM_BUILDOPT),-D $(opt))
endif
# default MLS/MCS sensitivity and category settings. # default MLS/MCS sensitivity and category settings.
MLS_SENS ?= 16 MLS_SENS ?= 16
MLS_CATS ?= 1024 MLS_CATS ?= 1024