From owner-svn-src-all@freebsd.org Tue Aug 28 14:46:51 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32E9D108E97E; Tue, 28 Aug 2018 14:46:51 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D3DA0871EB; Tue, 28 Aug 2018 14:46:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B233663DC; Tue, 28 Aug 2018 14:46:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7SEkok4086203; Tue, 28 Aug 2018 14:46:50 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7SEkn16086197; Tue, 28 Aug 2018 14:46:49 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201808281446.w7SEkn16086197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Aug 2018 14:46:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338347 - in head: sys/conf sys/modules tools/build/options X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: sys/conf sys/modules tools/build/options X-SVN-Commit-Revision: 338347 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2018 14:46:51 -0000 Author: imp Date: Tue Aug 28 14:46:49 2018 New Revision: 338347 URL: https://svnweb.freebsd.org/changeset/base/338347 Log: Put building of drm and drm2 modules behind options. Make the building of drm dependent on MK_MODULE_DRM and the building of module drm2 on MK_MODULE_DRM2. The defaults are unchanged. Approved by: re@ (gjb) Differential Review: https://reviews.freebsd.org/D16894 Added: head/tools/build/options/WITHOUT_MODULE_DRM (contents, props changed) head/tools/build/options/WITHOUT_MODULE_DRM2 (contents, props changed) head/tools/build/options/WITH_MODULE_DRM (contents, props changed) head/tools/build/options/WITH_MODULE_DRM2 (contents, props changed) Modified: head/sys/conf/kern.opts.mk head/sys/modules/Makefile Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Tue Aug 28 14:33:04 2018 (r338346) +++ head/sys/conf/kern.opts.mk Tue Aug 28 14:46:49 2018 (r338347) @@ -38,6 +38,8 @@ __DEFAULT_YES_OPTIONS = \ IPSEC_SUPPORT \ ISCSI \ KERNEL_SYMBOLS \ + MODULE_DRM \ + MODULE_DRM2 \ NETGRAPH \ PF \ SOURCELESS_HOST \ Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Tue Aug 28 14:33:04 2018 (r338346) +++ head/sys/modules/Makefile Tue Aug 28 14:46:49 2018 (r338347) @@ -583,8 +583,12 @@ _cpuctl= cpuctl _cpufreq= cpufreq _cs= cs _dpms= dpms +.if ${MK_MODULE_DRM} != "no" _drm= drm +.endif +.if ${MK_MODULE_DRM2} != "no" _drm2= drm2 +.endif _ed= ed _em= em _ena= ena @@ -781,7 +785,9 @@ _cardbus= cardbus _cbb= cbb _cfi= cfi _cpufreq= cpufreq +.if ${MK_MODULE_DRM} != "no" _drm= drm +.endif _exca= exca _ffec= ffec _nvd= nvd @@ -791,7 +797,9 @@ _wi= wi .endif .if ${MACHINE_ARCH} == "powerpc64" +.if ${MK_MODULE_DRM2} != "no" _drm2= drm2 +.endif _ipmi= ipmi .endif .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" Added: head/tools/build/options/WITHOUT_MODULE_DRM ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_MODULE_DRM Tue Aug 28 14:46:49 2018 (r338347) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Disable creation of old drm video modules. + Added: head/tools/build/options/WITHOUT_MODULE_DRM2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_MODULE_DRM2 Tue Aug 28 14:46:49 2018 (r338347) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Disable creation of old drm2 video modules. Added: head/tools/build/options/WITH_MODULE_DRM ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_MODULE_DRM Tue Aug 28 14:46:49 2018 (r338347) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Enable creation of old drm video modules. Added: head/tools/build/options/WITH_MODULE_DRM2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_MODULE_DRM2 Tue Aug 28 14:46:49 2018 (r338347) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Enable creation of old drm2 video modules.