From nobody Thu Nov 14 20:58:13 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 4XqCD52ppXz5d85p; Thu, 14 Nov 2024 20:58:13 +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 4XqCD52M8gz485R; Thu, 14 Nov 2024 20:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731617893; 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=ZibCTvmTq/KWvbkz/Z7pzlLf9Ulr43Eg6mLDkwlaHmk=; b=V5dNIknhMFlb2lAVQ+U1g2KSg0Fe7Gvd4P2bbSEmdpnsVi8lkdBAUFqm7m0ybo+GUIQN2G HXshVwf47l1o3PmJtRML32X+gEAnWxnldLYBHZ8dpdt9vHxOpZWtzXzVwfrCFf+JPwOVdG 7DDAk63PcKiY9VoE6q7Da47pgBBWv9seegIhnhwgCpQnGyLRoSUSuYufhO4S5znKROH+t1 sAbP71k/+Uf2XzAdGoCxDYY4ojBJ4u5AX52yZjCdJ3Afa9JyRiHDa9xPcvduZP2coCRikd eAcjr95F6HE9QGVna7UKu+8ZYKblbQk8UP45z7mgxXNYBg9vLofqNEzQJX/Hvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731617893; 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=ZibCTvmTq/KWvbkz/Z7pzlLf9Ulr43Eg6mLDkwlaHmk=; b=q16xIj6DCFNmllMLGmdJRc1uSK+I9LIis3xfi+KyXhainRhO6lUwb8fXE9dEUpXVNILsWO u0+lRt/zqN5nm3tjFNS96Oxulo6KovZBniNTQmRcuBliiH7lOg99WUQcGUFHIAVPAqoNIC Bgo2eO5lSucqSz1blpkxYQTDaXZ30lSFBjuvN/9Tp1gom1Rf54ut35HsbO4feBtVtmJXcj +rPetbGi0P46neexUF9zfINIJpN6x0PO5slOHaKaUqT2328z6PULVCDVag2+uCp8qyRC08 RVAmrRtsJCEr8iSDfytTfiD227BuTzErOfOuVwq+CZjtZ9krX4cRldQ/l2Ud6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731617893; a=rsa-sha256; cv=none; b=bmf+cfKtJ5xH6sWKpKLi+DyDtXtARluz7EuWc4/0/FihNc/mNsCQyi4MO5Oqcz3Mp/sBzt b3hj3vTSk8RHgFPmi+C8CHHbyxDZDxpQMtIXIgEz7T+l979/1sGHcrQD6vFMSAemRs4qIZ RUHyPXe8IFEjO/Ms/R2Y/fOaA9JX/6AJmCu6UJOLL5NDE8d7/Of6/4W94q0YK6rZbSX9le qOwz+nY/jYCclcAUAIGzwRvJ/QJ0zmyUFZg57dCiFFcbi6Tk135WErvXEMnP6F9Yryu6Do I8OIETiLSATrd8YTCFXgHANVS73d59uMYwmsBO0a1wi6TDme2DgLgaw1MO6dow== 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 4XqCD51nLdzv5X; Thu, 14 Nov 2024 20:58:13 +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 4AEKwDY0074343; Thu, 14 Nov 2024 20:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AEKwD6S074340; Thu, 14 Nov 2024 20:58:13 GMT (envelope-from git) Date: Thu, 14 Nov 2024 20:58:13 GMT Message-Id: <202411142058.4AEKwD6S074340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 125ce840bc93 - stable/14 - 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 125ce840bc93f9cd9286c9724bf18f951e17d3fa Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=125ce840bc93f9cd9286c9724bf18f951e17d3fa commit 125ce840bc93f9cd9286c9724bf18f951e17d3fa Author: Jessica Clarke AuthorDate: 2024-02-02 21:17:23 +0000 Commit: Jessica Clarke CommitDate: 2024-11-14 20:57:41 +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 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"