From nobody Sat Jan 11 13:45:53 2025 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 4YVftT671Vz5kJhD; Sat, 11 Jan 2025 13:45:53 +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 4YVftT5FzVz4ShG; Sat, 11 Jan 2025 13:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736603153; 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=+vo/oF04IzJITtcs3/Kf/UUNQ+yYXitEI6sRx8M4wbk=; b=nxJMH/zmQU/Gl9u/x4EVnEX50IWhuVhH7C5SkPNH/6o2LEWld7wj21B3WlfYRaJfpSowS7 fNQqJ8L5pUSh1M9JRLQw5d9fiVvjan5a6xt4fMK2ZpRinC/f08602lnTeE7BM7qkkuLxP2 S+QyAqZHcNepmgeT/x7du1KYBUHvVCai5Aawb8Go6pKlwrtA4MHA/62dmlz0xDq7F5W2oR NWzgfUx521ibueU4l2a0ND8Aptu8XnPHi1AUv/ylKhaNcyAZhyrKK1Pf6ocAB4pOLrbGrH /2V/Cg39KT1fiwgbn/Cq4z/oQUCmm8t1Ce0MZzi5c4UKqoykCHH3eve79EovjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736603153; 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=+vo/oF04IzJITtcs3/Kf/UUNQ+yYXitEI6sRx8M4wbk=; b=hP/gr/76NXB+1udqY6gQTCt1j1nohyl1i0tv0ySbODvtqVWupThMmN9TB0jd1/uWo65kU9 0YQI7BWbLZfYXE7Xl1SmvV4cTxDWj3ZOi5x1/Y9KMW7pASVI9Qr6akmglo/r4VKzA4wxhl Ov22FKB912tBq+b+5mY3PRjd2VcdUgBnmnOHvBy0FyZ6r6tEjFVE47Uzx1kJKx35RS7KmV 6g8sCDhpOrjDK4zGgQ6jBvvvg0DSgnOgBTcajXan+/eLdEfty9KMwdQvMU+vZ4TMRqpXG8 lUZm3jPALM80GUKLu2h1/5MHNfYvmGPLmytwqwY09VfHBHeuDN3lVzZ0xRMa0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736603153; a=rsa-sha256; cv=none; b=KxznpO5Zsyn7p0cz94jdNWmIecs0SGGrq9JiNoBq65yVizaDt9oktjEIrzdONaUUl44fX5 z78m8Y1q4Eug8igyuGtL3VWjZxUUfXfv4KIs1WYYpxJe86XTGQ4zXcphP7VayBhFappL3V Dk+oje9CKHSNIM01x5HMh+uCRpWux3vthOJ2KBBS02RhiL0SDlhGelJ81ZElQAqEMjUz0R eO97VR18KbF3TeNAZblq26eGGhPQooxnuuBUmJLUYnkWBagAy5Mb4sGmoRZSx3OwBT83a2 maJIPhNAwnphDKHXJBjDnZmq4oe6nOwZbzMm3N+EBMdXW2mvUnijVdhesy89Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YVftT4T2pz11bZ; Sat, 11 Jan 2025 13:45:53 +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 50BDjrVI004809; Sat, 11 Jan 2025 13:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50BDjrmu004806; Sat, 11 Jan 2025 13:45:53 GMT (envelope-from git) Date: Sat, 11 Jan 2025 13:45:53 GMT Message-Id: <202501111345.50BDjrmu004806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6eae413a2545 - main - build: Check NO_ROOT and METALOG for more targets 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6eae413a25450c99a5d91d443569c3c1a51b4a4d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6eae413a25450c99a5d91d443569c3c1a51b4a4d commit 6eae413a25450c99a5d91d443569c3c1a51b4a4d Author: Ed Maste AuthorDate: 2024-12-31 14:47:33 +0000 Commit: Ed Maste CommitDate: 2025-01-11 13:44:53 +0000 build: Check NO_ROOT and METALOG for more targets In f6575ed0deb08 I added a check that DISTDIR is set and is not / for `make distributeworld`. Extend the check to `distributekernel` and the two package* targets as the same argument applies. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48339 --- Makefile.inc1 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index fe799218ab0a..c8e6e63d2e39 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1000,13 +1000,18 @@ INSTALLFLAGS+= -h sha256 IMAKE_INSTALL= INSTALL="${INSTALL_CMD} ${INSTALLFLAGS}" IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" .endif -.if make(distributeworld) + +.if make(distributeworld) || make(packageworld) || make(distributekernel) || \ + make(packagekernel) .if ${DISTDIR:U/} == / -.error DISTDIR must be set for make distributeworld and may not be the root directory. +.error DISTDIR must be set for make distribute* and make package*, and may not be the root directory. .endif .if !defined(NO_ROOT) || !defined(METALOG) -.error NO_ROOT and METALOG must be set for make distributeworld. +.error NO_ROOT and METALOG must be set for make distribute* and make package*. +.endif .endif + +.if make(distributeworld) CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR} CERTCTLFLAGS+= -d /base .else