2018-10-27 16:13:36

by Sugar, David

Subject: [PATCH] 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 <[email protected]>
---
Makefile | 1 +
support/Makefile.devel | 4 ++++
2 files changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 22e31392..57d297c9 100644
--- a/Makefile
+++ b/Makefile
@@ -545,6 +545,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
--
2.14.4

2018-10-27 19:11:37

by Chris PeBenito

Subject: Re: [PATCH] Update CUSTOM_BUILDOPT

On 10/27/2018 12:13 PM, David Sugar wrote:
> Have Makefile include CUSTOM_BUILDOPT in generated build.conf
> Update Makefile.devel to pass CUSTOM_BUILDOPT while building module
>
> Signed-off-by: Dave Sugar <[email protected]>
> ---
> Makefile | 1 +
> support/Makefile.devel | 4 ++++
> 2 files changed, 5 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 22e31392..57d297c9 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -545,6 +545,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

Merged.

--
Chris PeBenito