From owner-svn-src-all@FreeBSD.ORG Sun Jan 25 17:46:56 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46C35E41 for ; Sun, 25 Jan 2015 17:46:56 +0000 (UTC) Received: from mail-ie0-f171.google.com (mail-ie0-f171.google.com [209.85.223.171]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 094C9ED1 for ; Sun, 25 Jan 2015 17:46:56 +0000 (UTC) Received: by mail-ie0-f171.google.com with SMTP id tr6so5195417ieb.2 for ; Sun, 25 Jan 2015 09:46:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=fEDmA2rx2AXirJTHS5rSQkRJRZ+pRpA1AkB3PBCR4tA=; b=EB0Nu72D7MfsVDGfrCqVbAi2BqT+dJJETuZ5KHAeoxUy4K/H1HGhfME18Im9vDsvmt Lt7NUKVt60L4kQY74cybodAvr8UgzSwjcflKSSZPZNHCwJswoJhvBiY1W+rn+4YPCmYE IH053QhgD7ujPXou1F7SONuMtlA6PnukxZZL+HsD40rbahqcozAc6cLFmMbVgYqSNFEu frQiUCvkzpcPolNy0wrnq/51vuyrxede3ieWQJVbpGBxkddgBRwxLU6WKNj0b4Ms+OcJ aXHH5svtcqkbS3UD0NfEwTp0OYFl7d6TZ7bP5Qb96QBNJyn1aFAy3CkGRvI0edMa0SVw b1Yw== X-Gm-Message-State: ALoCoQknMbcrx7jf+kwJpiUMjW6uckGLffdBOdOoQqMWTiaj1DNBh5vBdHsrvNF7ctrkC9uFa6rI X-Received: by 10.107.10.28 with SMTP id u28mr14266728ioi.5.1422208014926; Sun, 25 Jan 2015 09:46:54 -0800 (PST) Received: from netflix-mac.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id y200sm4592906iod.23.2015.01.25.09.46.53 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 25 Jan 2015 09:46:54 -0800 (PST) Sender: Warner Losh Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) Subject: Re: svn commit: r277681 - in head/sys: conf modules From: Warner Losh In-Reply-To: <201501250513.t0P5DGoc033955@svn.freebsd.org> Date: Sun, 25 Jan 2015 10:46:53 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <0CF820AF-D73D-4CE8-BE5B-C4EBE5A9EFDA@bsdimp.com> References: <201501250513.t0P5DGoc033955@svn.freebsd.org> To: Garrett Cooper X-Mailer: Apple Mail (2.1993) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Sun, 25 Jan 2015 17:46:56 -0000 The number of MK_foo opts that are intruding into the kernel module = builds is starting to get out of hand. :( Especially since they are duplicative of = the MODULES_OVERRIDE functionality and are very unevenly applied. Warner > On Jan 24, 2015, at 10:13 PM, Garrett Cooper wrote: >=20 > Author: ngie > Date: Sun Jan 25 05:13:15 2015 > New Revision: 277681 > URL: https://svnweb.freebsd.org/changeset/base/277681 >=20 > Log: > Build cuse(4) if MK_CUSE !=3D no >=20 > MFC after: 1 week > Sponsored by: EMC / Isilon Storage Division >=20 > Modified: > head/sys/conf/kern.opts.mk > head/sys/modules/Makefile >=20 > Modified: head/sys/conf/kern.opts.mk > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/conf/kern.opts.mk Sun Jan 25 04:58:41 2015 = (r277680) > +++ head/sys/conf/kern.opts.mk Sun Jan 25 05:13:15 2015 = (r277681) > @@ -27,6 +27,7 @@ __DEFAULT_YES_OPTIONS =3D \ > CCD \ > CDDL \ > CRYPT \ > + CUSE \ > FORMAT_EXTENSIONS \ > INET \ > INET6 \ >=20 > Modified: head/sys/modules/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/modules/Makefile Sun Jan 25 04:58:41 2015 = (r277680) > +++ head/sys/modules/Makefile Sun Jan 25 05:13:15 2015 = (r277681) > @@ -86,7 +86,6 @@ SUBDIR=3D \ > ${_ct} \ > ${_ctau} \ > ctl \ > - cuse \ > ${_cxgb} \ > ${_cxgbe} \ > dc \ > @@ -393,6 +392,10 @@ _random=3D random > .endif > .endif >=20 > +.if ${MK_CUSE} !=3D "no" || defined(ALL_MODULES) > +SUBDIR+=3D cuse > +.endif > + > .if (${MK_INET_SUPPORT} !=3D "no" || ${MK_INET6_SUPPORT} !=3D "no") || = \ > defined(ALL_MODULES) > _carp=3D carp >=20