From nobody Thu Apr 24 14:35:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zjz5m30tlz5tNby; Thu, 24 Apr 2025 14:35:08 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zjz5m0MMDz3VRZ; Thu, 24 Apr 2025 14:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745505308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F6i+whCjqWMuSIdSaF7oNpcOWVzOg9YRnq7W+YFEjW4=; b=pN1OH+orkWpy1tahG991qOlXlxkHXIWPaYm6b3cQJs4XevZBjRCBqcVQBqfe36wYJFFYYR jc1uSXLbSjTIphdC8EI8Rr5gb2fUKhvrcmciqtYaqwE2s/8vtLnJww153UCu2ZRQxclWJH gKWdTIuNKKSh4Iw/AYcEanw/jR8h1QzSfzXQazTWq01B0+CiYrZF2cbUj53HUXW3qN2SPH 9jmVGIXCFFT/1UW7LflRMpHhW1usOt/nWrajt5RCSHAtbF2DUPV8ophTwo6P9a1dRiwk0E Tykg+/bnH4Gyhb6Sp8Gt2zlaAl4GihVBFL37YThMlbq1Wy6PfQutxca5KJXrCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745505308; a=rsa-sha256; cv=none; b=bGfqSGx2+g81a/fN4yL+dfAbW2MSyM6L2erXDEYltQcymnw7UrPEzjR9whJfbhjb4evy7+ VlOXSdyMcEBngXTlU1mEDm9DFv0c2Z+q4CbvcvWiac6votDprQxJRL2x4pMg034WVMPFnU L60LfcuYTQUZxRpF8b+nXLfOr2wB366pvjg/+KR2lu3xo2OBBSfEs4XOXN2+tL35niOAej Sr/Vvd2tdYhCHA34G7vDHtxH1Y0ApJeHZD1sk6uZDlwE51VrUlD3cHoy7VKefjq7kKgeQv 7cS/wF/QKiCw7YvgWpSRfGssC+Pedi1YrZ7+Lie/P/OjOrIBK4f1GuwI92Y+mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745505308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F6i+whCjqWMuSIdSaF7oNpcOWVzOg9YRnq7W+YFEjW4=; b=An5U31Aa4steWBM/hq5Vaz+7lleP02acvYsBTkx1MELgTidhtj+IsFWNw/R78+O2b04UKG Xzdjxb3JoXVOtCAFYc4tFDX2LSade8sSYdTYuqkwba39NR9ZguKVeoys40unbtJutYuBRp su5ZayLIjuxHcjHjVlzPlpZainfkqWph0nlYGMCPy1kYiRrc+Dr0xEsFD8keYpHUVVuH2S UI6Ot8IlFBdPbXedPz53PHKdTeoWJVlmGCpweYJgd/ew607KG/wJ2SBikC7mwCcIPfNHyj vVF1TWgO5Ct20ibhBV7zNRxSE7scM+OVDCjYkz2y6lpAapnssn1ogf4dW84cNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zjz5l6wKTztn0; Thu, 24 Apr 2025 14:35:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53OEZ7NY076328; Thu, 24 Apr 2025 14:35:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53OEZ79u076325; Thu, 24 Apr 2025 14:35:07 GMT (envelope-from git) Date: Thu, 24 Apr 2025 14:35:07 GMT Message-Id: <202504241435.53OEZ79u076325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f83ec40fca52 - main - Makefile.inc1: Let the buildetc target run outside of etc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f83ec40fca52e1e2319b5d4f770f8263378265d6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f83ec40fca52e1e2319b5d4f770f8263378265d6 commit f83ec40fca52e1e2319b5d4f770f8263378265d6 Author: Mark Johnston AuthorDate: 2025-04-24 14:32:41 +0000 Commit: Mark Johnston CommitDate: 2025-04-24 14:32:41 +0000 Makefile.inc1: Let the buildetc target run outside of etc Commit 49bc071f4088 ("nsswitch.conf: Avoid modification after installation") changes handling of nsswitch.conf such that we make a copy in the objdir during a build. Historically, the in-tree nsswitch.conf lived under etc. The buildetc target and its copy set SUBDIR_OVERRIDE=etc when building the object tree, but I think this isn't right when conf files are scattered around the src tree. If any of them require non-trivial processing, they'll get skipped during buildetc, and then some build-time commands may run during installetc. In the linked PR, this fails because the src tree is mounted read-only and no objdir was created during buildetc. Remove the SUBDIR_OVERRIDE for the _obj target, and build the buildconfig target across the tree. PR: 286072 Fixes: 49bc071f4088 ("nsswitch.conf: Avoid modification after installation") Reviewed by: brooks, dim Tested by: dim, Alastair Hogge Differential Revision: https://reviews.freebsd.org/D49960 --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 4a0e4a884532..ebba0ccd9f5e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1674,8 +1674,8 @@ buildetc: .MAKE .PHONY ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _legacy ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _bootstrap-tools \ MK_CROSS_COMPILER=no MK_TOOLCHAIN=no - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _obj \ - SUBDIR_OVERRIDE=etc + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _obj + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 buildconfig ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 everything \ SUBDIR_OVERRIDE=etc