From nobody Fri Nov 15 23:30:48 2024 X-Original-To: dev-commits-src-all@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 4XqtYj6QKTz5dhxt; Fri, 15 Nov 2024 23:30:49 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqtYj16jdz3xhG; Fri, 15 Nov 2024 23:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731713449; 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=8jtWMrhZBWo0tbww3TP4dEbmscdTcLwJxDdrn3a40+w=; b=Mh8W4d62Yo9HEPOco91GVN2dAA/FYj1LE7CII7Kml+Xo3D/zYtbhSSzaDVyn6pFwKYIIyD LMgrrif/KztBp0oLiYxoiOdyUoWusfzrbwroPwTj+qhmnSjVAM7lkLP1dd35nqHEZVBmCs XKWhHW1k2QxGUQ1EYnoKazDxICMN4qFdsOvKwZrYOVGBgrk1ZWWcCI6P5abNcBdBTHG+jP cxvAaZhlSrUswEoSBFS7rKBf+Cq1WYExdM6jJm9vkhSZF4DFw1yoim/LwfDbB2T49p0wi5 kgYzCYMwcAPrkrXPzbMOtBv1Cd5IJWEnLM5n35dLuCvSwbJZ5A7TsSFhQSY/rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731713449; 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=8jtWMrhZBWo0tbww3TP4dEbmscdTcLwJxDdrn3a40+w=; b=NEJ/CIIyqTbShihoz9whD6fjfJufz1+fy+COcZ1A4OHJOtRDWWQV9Zd9e3v+CjHbzflymY e3Kd6s1P1XRcnL3MoYYPuXkWaJfU5Okd3QuMiU/cwOb9fvvdGi/wmfs90BT2MSAU2JiayL G88pzXmu4KhZNSSeUn3c7IGH3B8QaupiWbEP2PLpyOY+/vqWJWr3hvZP1crTGTi3HVanfH zjyd3qOlTtraFY8o/hVYwWNxqQxrRxjEIUB7cCVTdAEhlsi3AjDvsKJyBcijz6I1b2D4Nc JMWgKLFhj5c6oKhydQuiZZoFseMfGFawI2JGskYBr/UpKIXIW27JOEEqTvWAeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731713449; a=rsa-sha256; cv=none; b=gSeCCvyeIAPe1MIeC2k3AjTURsAYxBoepbxiReqt/LEApOTGGdUSw8ZHLNwsBNb000USCS w39tb+025K0a6rW5PBW8gl91QTk06y0hibdQsmnMKDEH54YeUzKthE+gW9MjWwSzWzCrPi 2xklYh5i0W+8UJTfOdctXBpro17ZsqX+btHoJsXtNGsnHsS3UgHXcyF7jj+3PPWajJlJf8 HGIZpePMvGHtFmSehUlcWdlI2xJbjj0w7uS02CHKp2DjxKPPo+PVGfdV5WzfRcm0RNH28v par2caZt82kRG4uQVs4pquy5StnQyNDSW3VgpUdTluhIf+4jyeJ7A0Y4G6tWag== 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 4XqtYj0Md0zjYL; Fri, 15 Nov 2024 23:30:49 +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 4AFNUmZj041979; Fri, 15 Nov 2024 23:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFNUmU1041976; Fri, 15 Nov 2024 23:30:48 GMT (envelope-from git) Date: Fri, 15 Nov 2024 23:30:48 GMT Message-Id: <202411152330.4AFNUmU1041976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9513b68501c0 - releng/14.2 - bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 9513b68501c0c17be13d27c94a229ca18b297ac3 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9513b68501c0c17be13d27c94a229ca18b297ac3 commit 9513b68501c0c17be13d27c94a229ca18b297ac3 Author: Jessica Clarke AuthorDate: 2024-02-02 21:17:23 +0000 Commit: Colin Percival CommitDate: 2024-11-15 23:23:02 +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."). Approved by: re (cperciva) 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) (cherry picked from commit 125ce840bc93f9cd9286c9724bf18f951e17d3fa) --- 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 72e835d97730..83cead36ade6 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 ${MK_META_MODE} == "yes"