From nobody Mon Dec 16 00:39:51 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 4YBLgW5k3jz5gYpW; Mon, 16 Dec 2024 00:39: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 4YBLgW4zrlz3wv9; Mon, 16 Dec 2024 00:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734309591; 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=ktyMx8SX5qPydGTV1e/SOWoRSgBMyONMGttC2yKir4Q=; b=V6RW1jBm7zWqm33jhEZoY0Cf3xfk1bqW2FtttdLwwv6aGAk6QrqnmUocc+8uQTcNF1UPga B3MH9OWLuvXIHtlTcT3oHh8A+6AlEI12QJdtX9HI+PZAbKEcS1Bb7X8cSOQj9cV40mkdmY v8bHfHdTFKE5VNzETvUiVoaVXfc0shNPSXdhK+IC2f9EyUNh/LtLrYA5JQAbC7NJ+UrDsP 0iQcmx7yIOdkxVmByV9T+2zY8oARLO//ku7Fmswi8vjnB7SZqC9f0Lxi6jSadhIVa5AAXx Wj7kGSwbD0ueSAwhnDc1r5e7hhxgQxOBH5v7Y0aVsCC614863I2XRVYBU6CXgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734309591; 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=ktyMx8SX5qPydGTV1e/SOWoRSgBMyONMGttC2yKir4Q=; b=Bm4cp6vlhSV2I+dMCJ4csWQu6/pPqSENTGib+GpVHsNrdZ35FkJnD5wm6jDufEew5MFNOC f1Bgg5exIWWmfEuxMfHnf5slD5PmAkXHf1XQPE4+JYx2/0fxAs+Ho06GXnt/PHL960LNaK 7dHWWrzHCqJR5XULnVsgtj4xo/bOO0DHmr1j8jRqTnMXEBqiE5pGEQinfibi4BUo6Y6dfl 4Xp5Kfzb0cZEo6B9+CCYcnQeTZcjeW0ey0YJ6wOhjd4pp8yGokugy9J1CzgHg97C91F69W 8Ixe8OMO+q/H5zAWwTeKYHudFUfrgDXyxBeB9qMbM5hX7S9KlOd9w39Pnz8PRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734309591; a=rsa-sha256; cv=none; b=IO1vIgBLLi6q715nOJs1p+tytx4nEtUmDfNuyOfP14NrVTzLVf84e/1Mq5te0B1sMyLRZo M/Oo0dZ/gWrkefHUNSNWj9SIkJ5KME+izGzZohb5mfUuw9ndbYQ4HkJcyUMGQAZEqRoAVn Omg2MsiI9V/tZ2YJ0ricU0iLn1TJmSYE0uVlOtRFZ99d/C9rVeoh2r2ZPvMM96zcAVwo91 A+DIc6y8XcYgScS/5xP1GR4o/rPVnYyD3X7v0hEQRo2Sz28FZwdNCWVkLaOPn/BbdrSzb0 ZWuwHFWNLWaZ9xlWUzmm29IDkuMdMzrp/ECsCIz/by33nHk3CXp9TPgtBIf7qA== 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 4YBLgW4L1yzXNL; Mon, 16 Dec 2024 00:39:51 +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 4BG0dpUq066665; Mon, 16 Dec 2024 00:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BG0dpvQ066662; Mon, 16 Dec 2024 00:39:51 GMT (envelope-from git) Date: Mon, 16 Dec 2024 00:39:51 GMT Message-Id: <202412160039.4BG0dpvQ066662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6d1d5577ce10 - stable/14 - Makefile.inc1: Require DISTDIR be set for `make distributeworld` 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d1d5577ce1076ea2080bf243611d0f76c646a35 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6d1d5577ce1076ea2080bf243611d0f76c646a35 commit 6d1d5577ce1076ea2080bf243611d0f76c646a35 Author: Ed Maste AuthorDate: 2024-12-11 15:53:42 +0000 Commit: Ed Maste CommitDate: 2024-12-16 00:39:08 +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 (cherry picked from commit f6575ed0deb08026c5ee261495e000831688e5a2) --- Makefile.inc1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1927a69ef732..d4ec63091e5a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -979,6 +979,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