From owner-svn-src-head@freebsd.org Tue Mar 31 22:41:57 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3D2826ED91; Tue, 31 Mar 2020 22:41:57 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48sPTJ551Zz3JtC; Tue, 31 Mar 2020 22:41:56 +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 2CA5819F7E; Tue, 31 Mar 2020 22:41:49 +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 02VMfm9f048231; Tue, 31 Mar 2020 22:41:48 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02VMfmpg048230; Tue, 31 Mar 2020 22:41:48 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202003312241.02VMfmpg048230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 31 Mar 2020 22:41:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359495 - head X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 359495 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2020 22:41:57 -0000 Author: imp Date: Tue Mar 31 22:41:48 2020 New Revision: 359495 URL: https://svnweb.freebsd.org/changeset/base/359495 Log: Fix make kernels to match original commit message make kernels was originally documented (in commit r295099) as the same as make universe -DJUST_BUILD_KERNELS. However, it used the UNIVERSE_TARGET=buildkernel which is subtly different in that it also builds the toolchains and doesn't build the LINT modules unless they happened to already exist in the tree. This unbreaks POLA and just builds the kernels, including LINT, now rather than all that other stuff as well. When the commit originally happened, the two just differed by the LINT bug. r335711 introduced the universe dependency on the toolchain that wasn't present before, which diverged the two further. This restores the original intent of r295099. Reviewed by: brooks, bdrewery, emaste (LGTM) MFC After: 3 days Differential Revision: https://reviews.freebsd.org/D24212 Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Mar 31 22:41:43 2020 (r359494) +++ head/Makefile Tue Mar 31 22:41:48 2020 (r359495) @@ -479,7 +479,7 @@ kernel-toolchains: .PHONY @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe kernels: .PHONY - @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildkernel universe + @cd ${.CURDIR}; ${SUB_MAKE} universe -DWITHOUT_WORLDS worlds: .PHONY @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe