From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DA4FC46475 for ; Sat, 27 Oct 2018 16:13:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDC0020843 for ; Sat, 27 Oct 2018 16:13:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=tresys.onmicrosoft.com header.i=@tresys.onmicrosoft.com header.b="AWkfKcGV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDC0020843 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=tresys.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=selinux-refpolicy-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728783AbeJ1AzD (ORCPT ); Sat, 27 Oct 2018 20:55:03 -0400 Received: from mail-eopbgr730137.outbound.protection.outlook.com ([40.107.73.137]:35433 "EHLO NAM05-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728696AbeJ1AzC (ORCPT ); Sat, 27 Oct 2018 20:55:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tresys.onmicrosoft.com; s=selector1-tresys-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BtJXmzq5/fqx+tlTKx+ufCfvrjKOFoyX547CMk+V8dI=; b=AWkfKcGVHcbOA03eqGz8T9aou6XzkRqV2s3+1qjbfvTbCIhoasWk5AZvsYNuH5OBadL1sfhvytEl8PMVG06YczXlg7SYacmP03ditEb8Ghfn+lFB6TeAtdPnVBgnNdE6HwWk80WZ/QG8VpCazmsUlW/xec6BveH5+0y57IJXKyU= Received: from BN6PR15MB1507.namprd15.prod.outlook.com (10.172.151.147) by BN6PR15MB1425.namprd15.prod.outlook.com (10.172.150.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.21; Sat, 27 Oct 2018 16:13:33 +0000 Received: from BN6PR15MB1507.namprd15.prod.outlook.com ([fe80::c0de:889e:7675:1b74]) by BN6PR15MB1507.namprd15.prod.outlook.com ([fe80::c0de:889e:7675:1b74%3]) with mapi id 15.20.1273.025; Sat, 27 Oct 2018 16:13:33 +0000 From: David Sugar To: "selinux-refpolicy@vger.kernel.org" Subject: [PATCH] Update CUSTOM_BUILDOPT Thread-Topic: [PATCH] Update CUSTOM_BUILDOPT Thread-Index: AQHUbhAB+hgy+CGGIEeIGVPOiQoQug== Date: Sat, 27 Oct 2018 16:13:32 +0000 Message-ID: <20181027161252.11199-1-dsugar@tresys.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [73.180.141.176] x-clientproxiedby: BL0PR0102CA0019.prod.exchangelabs.com (2603:10b6:207:18::32) To BN6PR15MB1507.namprd15.prod.outlook.com (2603:10b6:404:c6::19) authentication-results: spf=none (sender IP is ) smtp.mailfrom=dsugar@tresys.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BN6PR15MB1425;6:Rj+rAcGqvusScNZUmZ7tdzGnBW4KMsQaCeJtfqg3pyS4t99IuaH+r7s9O/jRInWc8yoWMvpYxmqt61f4cZAFkH0HiQwVX/BqSdgwP0MRmlU7KQzi/+VjDmDlXEifdOHmEI2wF7+nSatURGSRHro3J/kzW2hFUZQfoi/Kj05GynOPOAJ7sBaw2uHb6nXCnOdEnDHPDZerZMpceQlXx/rPNwOuAg+RWvRg07v8yRQ9NwW2hsQaqSpHCH6Z01ug5teGPBN36beBECKNrgiJScvkl3HEv2FNZU78rUB/yje2b5tp9stqBPtOTIcLT+GKTHS2vZmQitMXh6GotamQKWvd9/VAxrhx/iPVBOFvg141GA7qF6QksFYOJEy0+3rLwaY+lria4JPc0XL6xxRTZFLwGZ8QNOzmclf0JAJ1WVL1sljLJOaz+QNzVTEh3haM0/tkzLgeNrqoosu1JLW86X2zmg==;5:HiH3/CdvRrBaq0eyMTDHWGngCFqxaZ2xSh1BGrRcxepFz0FIjkLibMuMJo0xCbh4U33E0H5dpGoApWDFuG61d4O+caOdNpDUW/vnN0+vLyFftkQ8XJRtGGFjaib3c+rwaTINFpu+9ptlYWix7bIxqhFql8lz4bTf7z+Ip1myXdA=;7:4uh7LgFb9/JCaowQ0cC3cqUxd9l7MwBCR4yBRrN/L0mplxfadwk9H6SOBC1PO03p/q8vUdANTFIMkn4P9YEyR9cYmC6BDFPqmbNIo3WZ1zQ/e0IqrjEawmda5t+mLzSJxHsqH8C+GGOP2DdrNOYVPw== x-ms-office365-filtering-correlation-id: c2f7e1d7-ac30-4f72-5049-08d63c2723e5 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(7021145)(8989299)(4534185)(7022145)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:BN6PR15MB1425; x-ms-traffictypediagnostic: BN6PR15MB1425: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231382)(944501410)(52105095)(93006095)(93001095)(10201501046)(148016)(149066)(150057)(6041310)(20161123558120)(2016111802025)(20161123564045)(20161123562045)(20161123560045)(6043046)(201708071742011)(7699051)(76991095);SRVR:BN6PR15MB1425;BCL:0;PCL:0;RULEID:;SRVR:BN6PR15MB1425; x-forefront-prvs: 08381C729B x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39830400003)(366004)(376002)(136003)(346002)(189003)(199004)(52116002)(68736007)(6506007)(316002)(386003)(86362001)(105586002)(106356001)(6486002)(7736002)(2351001)(305945005)(66066001)(102836004)(2906002)(99286004)(8676002)(476003)(486006)(5250100002)(81156014)(1857600001)(26005)(15650500001)(81166006)(2501003)(6512007)(2616005)(5660300001)(36756003)(5640700003)(6436002)(256004)(2900100001)(14444005)(1076002)(71200400001)(14454004)(97736004)(8936002)(186003)(6116002)(71190400001)(508600001)(3846002)(6916009)(53936002)(25786009);DIR:OUT;SFP:1102;SCL:1;SRVR:BN6PR15MB1425;H:BN6PR15MB1507.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: tresys.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: vOupaVChBOFW0JLLAigHpe0dXNqpb626WjqmM7MU46MjnkSpzjFPq70XfOFM1bkzdmB4FQyBcv7ohtVjImkf6FWl/5TGaZmxjR0YZprSfAo/0Rx0EAXxIUHG/FnXmiUcdztl8IO4IH7KaTHq5tLh7IHFEnZn9qeRVn1qv/Ca/ZlOwYqTe5jrHxHbSlRApHGvvgZ7FnGwvPRKwFYBAatJhVsh8oCzlSbYY3rDKBmIeVvB3Fm17hD3FTTFzFX9aEAH9B7lwbOb/B+bmC24Wdrr+IXN7eiHs09/lAD+f9v4s1u/UBhFnMDRo8YW6NZDh8eKQUmr6DfWZdZLvhQf2hZaP/eJGuzT0UcUMRTrX9GieXU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: tresys.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2f7e1d7-ac30-4f72-5049-08d63c2723e5 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Oct 2018 16:13:33.1272 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a0d45667-6c07-4e88-868f-4ac9af95c7ed X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR15MB1425 Sender: selinux-refpolicy-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux-refpolicy@vger.kernel.org Have Makefile include CUSTOM_BUILDOPT in generated build.conf Update Makefile.devel to pass CUSTOM_BUILDOPT while building module Signed-off-by: Dave Sugar --- 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 ?=3D n" >> $(headerdir)/build.conf $(verbose) echo "DIRECT_INITRC ?=3D $(DIRECT_INITRC)" >> $(headerdir)/bui= ld.conf $(verbose) echo "SYSTEMD ?=3D $(SYSTEMD)" >> $(headerdir)/build.conf + $(verbose) echo "CUSTOM_BUILDOPT ?=3D $(CUSTOM_BUILDOPT)" >> $(headerdir)= /build.conf $(verbose) echo "override UBAC :=3D $(UBAC)" >> $(headerdir)/build.conf $(verbose) echo "override MLS_SENS :=3D $(MLS_SENS)" >> $(headerdir)/buil= d.conf $(verbose) echo "override MLS_CATS :=3D $(MLS_CATS)" >> $(headerdir)/buil= d.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 +=3D -D enable_ubac endif =20 +ifneq "$(CUSTOM_BUILDOPT)" "" + M4PARAM +=3D $(foreach opt,$(CUSTOM_BUILDOPT),-D $(opt)) +endif + # default MLS/MCS sensitivity and category settings. MLS_SENS ?=3D 16 MLS_CATS ?=3D 1024 --=20 2.14.4