From nobody Fri Feb 02 21:18:07 2024 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 4TRTC34Hpwz58HKb; Fri, 2 Feb 2024 21:18:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRTC33pM0z575H; Fri, 2 Feb 2024 21:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706908687; 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=gKAJa4zySd/UvFaxIpAdx5nQ4UuV0m04XJnveYrj/fk=; b=ZyzC9YH4XwoMWjiQVBprOv5nc3UcKgWJnJVMVndAHE3jcKYPg4PodXZT6QkDAv/SwYmwXw f7EuOHAFg+LXAXu9y5ka0xMXjyxi7UG3AaYd4dywwZHaF0QjcgRX7R2yXBKan/3Ve4xRqw C+QLgUZXhOWIKQEutlXukXURi9RBfGZ1lx1xOPUozLALbSwOHlQtV32iNVeYVxhXhyh1lX Kpmm0NFRcU8pG7p2iNQAwJ+sjdDahBdjwDy/Beol2Lr+61mDaAA+zdBommZXPuzitWcOF+ jtIGK+9foI+21hixGczepVVhFrE2oX2o9q1UA29nJ0hXIKKccAzFAq7D/318SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706908687; 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=gKAJa4zySd/UvFaxIpAdx5nQ4UuV0m04XJnveYrj/fk=; b=xQM6PQQ9q5czoiRrD850kpHRYnTPfv/spqQgO65TB2OG1P+gnAmnYT4B9dqnSTOSf/srG7 FWTP0v5qgAyDxQsRSFpVcZ0+tj7kseLIVFliWAPQu1jb1N7fBMtvs7OU2NnZ6XbS8VALx1 4mp0BXIDsAtJHSonBeMe2AEGJilQilakgq3SPhgCkFgu/hhq/QIM3HGrLvmfIrnNUn3Qcj gj3M7+P0fMZLqhYKnL4pwIm6JTYoCsCyXre6ywsGQzvX1HlMQIMwNEl1zD3sbXkj9l7dgN 1JZq8i1YfPuJkBOkZdA5GQvaqCohNNg8nyD+q0zoT+6CEXgryeRmicyBD9ir4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706908687; a=rsa-sha256; cv=none; b=Ogj+WYom5EjBVKZ3oMTI1O1C5SkGA0DahDn0Pt16tXT8H5rVZbC2PJa9t6I8q3L2W2fUr5 2sAUOKlChlqNp4vAOP87vfN6sM70jCczK8zUN98UxkYMEn0wvYlS3bTAi/i/PXi3gPO7+1 I6y7KYBw2aVpNxpdIptQtlBgWrZFBt7T9xIuuCUCoSAxQ0AZetgaWQF5yOuZedCVKGAZkw IlDlQ36RVcJCMhvuID4w4hehdnxj26Uu+WpSaBNWi5Q+cYx7cQUk98s22xk6b3qFk8+9LR 2MIhqqhgJeKs/l7OrY03GZdsv2HUZWAvKg+appzGLLqaY11MBXZZLWzh6oqYtQ== 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 4TRTC32rjzzmdC; Fri, 2 Feb 2024 21:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 412LI7QK073735; Fri, 2 Feb 2024 21:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412LI76x073732; Fri, 2 Feb 2024 21:18:07 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:18:07 GMT Message-Id: <202402022118.412LI76x073732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: fbae308319b7 - main - bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fbae308319b7678cd9d879f60b1efd8d4c99b5eb Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fbae308319b7678cd9d879f60b1efd8d4c99b5eb commit fbae308319b7678cd9d879f60b1efd8d4c99b5eb Author: Jessica Clarke AuthorDate: 2024-02-02 21:17:23 +0000 Commit: Jessica Clarke CommitDate: 2024-02-02 21:17:23 +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 --- 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 be623ea37aa6..95a178c04907 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -54,11 +54,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"