From nobody Mon Dec 15 18:18:21 2025 X-Original-To: dev-commits-src-branches@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 4dVSwt2crgz6L7JH for ; Mon, 15 Dec 2025 18:18:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVSwt1Nbhz4KrS for ; Mon, 15 Dec 2025 18:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822702; 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=zEGwdUQsOebYn18s0OFyOnnQnrvnoNgQ3ysNLyj6nbA=; b=ADiSW/wt1JM8Qm1xiGyYajyIcbWb/X/4zXWGKw+PwkEvT4s5oWi8GeCsiGKkIHCUhgtVoz JUerUy4qf+e1gU22ZKwqLfJZUjp6TeTDAf+YmLeHx0OTNa8noPcah0IZP0/6BxcY5TgI44 KzIYL8j9E0pqPydiLiV7HIkE2wQJiA+tk8JmxpO+0O+dKHz+ADt4w9mg0UqY2I+vQ2NATa F7zShZGHD2ZROEw1M0viWXmVM7BsySLskEHR4gR7x3FaUWJkBndcfzHpHd6g727XuaTRSA VBcQ9H7CXyui4npG+jeWjTSxO4B5B7WuuBKggcCr5XK2mAXBDvflpnGnS5hNgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822702; 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=zEGwdUQsOebYn18s0OFyOnnQnrvnoNgQ3ysNLyj6nbA=; b=i3KsPOCoNyWOjOZVXxPzGw++yUK/OabDLufIdNWCOsieHa9UeIrHuU/IFyrvKaS3mlbzWH CiCas4tM9ZMhqYA0m7GWAKM+Sl8WjoUQs6HwYUO4DD6VxABU+lSaKcNi+q6uKDRym7X+QP 0zsdnJ2ee5sBj7Rav3qZPmZd98MmwDa3yzLMT4qjFq5CX9+CKAH7shF/MtgkInWETEXbTA IzW/NH08F2w9wcJxfQp7BK/wNOdeGeMkEI4t38QSFxYpMujROxiAp967EkKcbZfjuAxegx sxbjhE6X7e4GqG66ujdfZRHHKUyB1xR16SjK+AV3mLBJX9VAnEfa8N589m3N+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822702; a=rsa-sha256; cv=none; b=NwWwdQCWX2ZIAItWMKPTJoLqNZkw7nicRMfe71pxhGuHAFQw9TTxl9L5waGe8cHh62yQnJ G5yCAxzZnOHoscJwHKxZt6RauL45T/a8Z2wP90xJqVcZJylmh/Z5LWU1S8NI6bmSWnRQaP z2oERt4ZTwwynqk8MOCkDgGIKrzS5T5SCmhytkZ+XGx+DkKyhR7TK1kbBZVIX8c/+5srf7 TQPJ4w5Sgs2EJhRsUTnBbZEFhmj5fmJdUtHKFtQ+qczCexZnwYL6x9PB87FcEPk0/eH4LU fzrfZzcnE7lvdj8ZToHWlGrHl1+FvHmcol5R1fcrQYXcuAk4qIDIFoZGtiJosw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVSws6ScYzWkZ for ; Mon, 15 Dec 2025 18:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 254ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:18:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: ede1087a4015 - stable/13 - bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ede1087a40152d764a5067a550dfecea0133a530 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:18:21 +0000 Message-Id: <694050ed.254ad.4091e514@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ede1087a40152d764a5067a550dfecea0133a530 commit ede1087a40152d764a5067a550dfecea0133a530 Author: Jessica Clarke AuthorDate: 2024-02-02 21:17:23 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:34 +0000 bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation Not all of the tree is happy for realinstall to be done in parallel. In particular, Makefile.inc1 uses .WAIT to force etc to be installed after earlier subdirectories, since etc calls into share/man's makedb to run makewhatis on the tree and needs all manpages to have been installed. Also, libexec/Makefile doesn't set SUBDIR_PARALLEL, and the link from ld-elf32.1 to ld-elf.1 relies on rtld-elf having been installed before rtld-elf32, otherwise creating the link will fail. In general, core behavioural differences like this between NO_ROOT and "normal" builds are also dangerous and confusing. If this optimisation is deemed important, it should be reintroduced in a more limited and robust manner that doesn't break the above situations. Until then value correctness over slight efficiency gains on high core count machines, the same machines where you're more likely to encounter issues from this optimisation. This reverts commits cd19ecdbdc87 ("Similar to r296013 for NO_ROOT, force SUBDIR_PARALLEL for buildworld WORLDTMP staging.") and b9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS."). Found by: CheriBSD Jenkins Reviewed by: bdrewery, brooks Fixes: cd19ecdbdc87 ("Similar to r296013 for NO_ROOT, force SUBDIR_PARALLEL for buildworld WORLDTMP staging.") Fixes: b9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43705 (cherry picked from commit fbae308319b7678cd9d879f60b1efd8d4c99b5eb) --- share/mk/bsd.subdir.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index e54a21521066..5c5fa9377e81 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -56,11 +56,6 @@ STANDALONE_SUBDIR_TARGETS+= \ installconfig installdirs installincludes installfiles print-dir \ maninstall manlint obj objlink -# It is safe to install in parallel when staging. -.if defined(NO_ROOT) || !empty(SYSROOT) -STANDALONE_SUBDIR_TARGETS+= realinstall -.endif - .include .if make(print-dir)