SELinux-Refpolicy Archive on lore.kernel.org
 help / Atom feed
* [PATCH] Update CUSTOM_BUILDOPT
@ 2018-10-27 16:13 David Sugar
  2018-10-27 19:11 ` Chris PeBenito
  0 siblings, 1 reply; 2+ messages in thread
From: David Sugar @ 2018-10-27 16:13 UTC (permalink / raw)
  To: selinux-refpolicy

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>
---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Update CUSTOM_BUILDOPT
  2018-10-27 16:13 [PATCH] Update CUSTOM_BUILDOPT David Sugar
@ 2018-10-27 19:11 ` Chris PeBenito
  0 siblings, 0 replies; 2+ messages in thread
From: Chris PeBenito @ 2018-10-27 19:11 UTC (permalink / raw)
  To: David Sugar, selinux-refpolicy

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 <dsugar@tresys.com>
> ---
>   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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-27 16:13 [PATCH] Update CUSTOM_BUILDOPT David Sugar
2018-10-27 19:11 ` Chris PeBenito

SELinux-Refpolicy Archive on lore.kernel.org

Archives are clonable: git clone --mirror https://lore.kernel.org/selinux-refpolicy/0 selinux-refpolicy/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 selinux-refpolicy selinux-refpolicy/ https://lore.kernel.org/selinux-refpolicy \
		selinux-refpolicy@vger.kernel.org selinux-refpolicy@archiver.kernel.org
	public-inbox-index selinux-refpolicy


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.selinux-refpolicy


AGPL code for this site: git clone https://public-inbox.org/ public-inbox