From nobody Fri Dec 13 15:23:50 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 4Y8tQv0Pkwz5gj41; Fri, 13 Dec 2024 15:23:51 +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 4Y8tQt6pDzz4qrM; Fri, 13 Dec 2024 15:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734103431; 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=UEur47oPN9WrQb7QCqUM53gNx6xdi73mch6+cSadP3o=; b=oP1Lf1JhTdzmVTuEWtEhxx77WehGxWw2kE+I61WN1WXoSPSi3ewUWE1YMXB0sRkuCtLXAW 8jBrENwTC4hvoEdny4sgaecYjSUZJgcpyb0FCFzPigyV+ToBP91hPWXW21sGb4052tjVeY fhuSVAL+/sm4kEXWbx+P5c8waLq6wFFG7MVXRpYCv/H8V6ZSmfIB3aZxAgXPzEJbegyr6I tmJtmkwMrXUWH8sumt0G1QqLQyIhlM1YIHctnTu7c8drELzj7pnvqLUYm+EuYp3SCfF3tl uUdaEGBbuNXXy3uxPAzcnHbC1uTLl61I56Xy4b3yzcGWUbhgzUX04TB88tZDDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734103431; 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=UEur47oPN9WrQb7QCqUM53gNx6xdi73mch6+cSadP3o=; b=O6339FMd0RzQ2180mVgYijTma8vuxMW0oV9CP1pT9k8AmsrpRlZx07bz2l8qsaZYxFChOz 4I3C4jdNm2ulj7sIBFwp6UE0Oqcjc7jcqMl97qmGf2XHM0Q5Ew4a4Dh6j+yS4hy9pEnMVc rEFTYyqgJpZmfm3s+ESz6bnSXuzxaY0x7NGEB2TFvRH1RridwHD88u8QNQikWwcjY8L5HX +ZZOSHCczgblmpeLAOe++c5CL6j0lwczXcBt/UotMgORmqOzm1zm8mGh741tVSwxtXKTfe zKfd4ned9YQpMUxsz3BDUlwAjbtJsSirNqUt9uhJBilc8pbuyxgNZGBm9YxKQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734103431; a=rsa-sha256; cv=none; b=mEEvno6tZwuCtkiXhQGmpqlcAmmjJY4G8onW4/07fFbgtq/WlSUjr33PgobTPpUGK2fwtw ohbuHWKe1bZ5v9MHHQNVjTrt5XTbwtmD89SUpNfTnyXFnujW/agOIrQwmmR5jJ+zzAxIZV w+HlGkzcX9fAsf5H/qJ0+etmLUvFKex2Z2H77gL6RKnyvXA9cqn0oF7rSKVlZ50sGsUnuL lmUr0CO6zzgZ5NyI1EjyumZX5BCUTWzC28k0/tXTRnLS18fpzC4EOOzIArqzuBIJforCn4 RhdN8gVfovYVxggWSzJjcZlC0lpzy3gPZX2Uyq2qfyYu1S0No604zNn/n+R74w== 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 4Y8tQt6P44zjj7; Fri, 13 Dec 2024 15:23:50 +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 4BDFNoel071076; Fri, 13 Dec 2024 15:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDFNooZ071073; Fri, 13 Dec 2024 15:23:50 GMT (envelope-from git) Date: Fri, 13 Dec 2024 15:23:50 GMT Message-Id: <202412131523.4BDFNooZ071073@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: f6575ed0deb0 - main - Makefile.inc1: Require DISTDIR be set for `make distributeworld` 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f6575ed0deb08026c5ee261495e000831688e5a2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f6575ed0deb08026c5ee261495e000831688e5a2 commit f6575ed0deb08026c5ee261495e000831688e5a2 Author: Ed Maste AuthorDate: 2024-12-11 15:53:42 +0000 Commit: Ed Maste CommitDate: 2024-12-13 15:22:01 +0000 Makefile.inc1: Require DISTDIR be set for `make distributeworld` distributeworld is the target used to stage world for building dist sets for release targets, and is not really intended for end-user use. If DISTDIR is not set we would attempt to write to the root directory. Error out in this case, serving as an assertion that an internal target is not being used incorrectly. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48030 --- Makefile.inc1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5cf431733f8e..bd0ed3ebfba8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1001,6 +1001,9 @@ IMAKE_INSTALL= INSTALL="${INSTALL_CMD} ${INSTALLFLAGS}" IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" .endif .if make(distributeworld) +.if ${DISTDIR:U/} == / +.error DISTDIR must be set for make distributeworld and may not be the root directory. +.endif CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR} CERTCTLFLAGS+= -d /base .else