From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A95D0138334 for ; Sun, 11 Nov 2018 23:29:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4283E0D2C; Sun, 11 Nov 2018 23:29:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AAB38E0D2C for ; Sun, 11 Nov 2018 23:29:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C0F8335CFD for ; Sun, 11 Nov 2018 23:29:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFBAA470 for ; Sun, 11 Nov 2018 23:29:32 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1541978251.c47e5c0bc2b6d37dc78dab7bceeb64f665a10879.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: support/, / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: Makefile support/Makefile.devel X-VCS-Directories: support/ / X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: c47e5c0bc2b6d37dc78dab7bceeb64f665a10879 X-VCS-Branch: master Date: Sun, 11 Nov 2018 23:29:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ad81f1fd-b565-4eca-a0b2-4c87871b0132 X-Archives-Hash: 0eadefe9babcfc05a40f6b9d1c9f3d2d commit: c47e5c0bc2b6d37dc78dab7bceeb64f665a10879 Author: David Sugar tresys com> AuthorDate: Sat Oct 27 16:13:32 2018 +0000 Commit: Jason Zaman gentoo 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 tresys.com> Signed-off-by: Jason Zaman 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