From nobody Fri Oct 10 04:43:26 2025 X-Original-To: dev-commits-src-branches@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 4cjYz31bcRz6BGVF; Fri, 10 Oct 2025 04:43:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjYz30zSZz4Pg2; Fri, 10 Oct 2025 04:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071407; 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=jo8AJ1mmouGTWxkqciY/qlDMeJfl4kjcJ5AAY4Of9z4=; b=jcF21L1An8YR+3YcjJQqCZh1lqbU8pCt1twgb9zUM4p9R8ZwBbx9+1sags2ZlCF2UDkyNv NHrCiktz7E5xwpQH99ECbgNNrO6MVcLhYLzl+ijpKxgVMGlqS1HTo7StR1GzKrszzeLv4n ZMJDaXOfx987hP+yLKBKKBU5IhntghYWgnUpV99B4NoDY9keQxAMxHTTLNztfqbiKbNgLt FdOMApqaXjO3bDcu2nCu30v16ZyXuASx+5REwqiEt+nZ+RruyTSe1KzUOlDtVQ0tfPe9VA LUXRWIoIaEs+KEtxr0AVfZnFV8f8C+h8uw1sYhAoTcEdO7L4WTkbjnJ6YJNwAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071407; 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=jo8AJ1mmouGTWxkqciY/qlDMeJfl4kjcJ5AAY4Of9z4=; b=w2WG5+E49NaO6IWKsWm/1B56hBNnxfprk3eqhIPkwF5sNrbmwDNpmrPsPJe5SIXH0GPli/ DbQW2KBtkHergaVLPSOkpho8xyGgyD63ON0N+kTrKHxwcSQ5W2NaCVf3d8/XhZfhesJDOu V5xWyq0+eJ3vPzJanekAWp2UXkgFTFQ3lyEUi3Z8l9RAMNPNzRE8/2jVr26dxBHCRXeHtE RohviB0ZcL3cHjhppOy3kVjOBvnT1zOeOLKHdiMqd2ZlNOh76YZx8LWPWcm7PjKUBub3M7 W7KxaPTWXoVbwQTZw4i2/xPvxyTuEQBjndIL6jAjQ/2MKt/MXd1QhgR1Jg84fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760071407; a=rsa-sha256; cv=none; b=YtoUXvC2qzfWMeXduuo11gZRDk8XrzdTtvT38VQsf+3eBvYVjpIdZ4MIp79BjE+e8mdb1h TM4JFiivDuuKnJQqtC2xM+Cz3ZYaL9wGW9U2crD2OEycIVFGZnu7Hxz9i2FUiKKASBuBUt VF/zu+C9rZ3rooXwb0IuQmBFU/qj5n1/Bs2/jFuy/cs1lgnFV9CPgmJaKgo7NqfQZsuKfC 1ARWnVo3j2isPRinV0lI83qCnQuZ/MZi9ozBUrsXz/htE0UuNQDZ7V1b70g95hwn62gDpB H47FqN+vlNopHsBMLf3ADJeMxx+cCJ0Fznwx9C4t4Bk6UTMAmxGrHVsc95yr1g== 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 4cjYz307ryzntg; Fri, 10 Oct 2025 04:43:27 +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 59A4hQ2Q096729; Fri, 10 Oct 2025 04:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A4hQNw096726; Fri, 10 Oct 2025 04:43:26 GMT (envelope-from git) Date: Fri, 10 Oct 2025 04:43:26 GMT Message-Id: <202510100443.59A4hQNw096726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 3e25b34d0159 - stable/15 - Makefile: Force DISTDIR=/ for (update-)packages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3e25b34d0159283490a3a8fa9a381cf80f177e5c Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=3e25b34d0159283490a3a8fa9a381cf80f177e5c commit 3e25b34d0159283490a3a8fa9a381cf80f177e5c Author: Lexi Winter AuthorDate: 2025-10-08 03:22:32 +0000 Commit: Lexi Winter CommitDate: 2025-10-10 04:29:35 +0000 Makefile: Force DISTDIR=/ for (update-)packages The make(1) variable DISTDIR is used by both ports and src with a different meaning. Some users may set DISTDIR in /etc/make.conf for ports, which previously worked fine when building src since the src targets which used this variable were not very commonly used (mainly, make distributeworld). Unfortunately, with pkgbase becoming the default, this is no longer true since make (update-)packages invokes make stageworld, which is sensitive to DISTDIR, and these users find that their build now fails. A correct fix for this probably requires renaming one or both of the DISTDIR variables, but for now, work around the problem by setting DISTDIR=/ for the user-facing pkgbase targets, packages and update-package. Since setting DISTDIR doesn't work for these targets anyway, this should not break any existing configurations. MFC after: 1 week PR: 290010 Reported by: Oleh Vinichenko Reviewed by: imp, bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52929 (cherry picked from commit f7dc7d7af3683836fcca68018a678b242d2e2620) --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 664f31a48abf..5f27f22d7a3f 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ TGTS= all all-man buildenv buildenvvars buildetc buildkernel buildworld \ create-packages-world create-packages-kernel \ create-packages-kernel-repo create-packages-world-repo \ create-packages-source create-packages \ - update-packages packages installconfig real-packages real-update-packages \ + installconfig real-packages real-update-packages \ sign-packages package-pkg print-dir test-system-compiler test-system-linker \ test-includes @@ -521,6 +521,9 @@ kernels: .PHONY worlds: .PHONY @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe +packages update-packages: .PHONY + ${_+_}@cd ${.CURDIR}; ${_MAKE} DISTDIR=/ ${.TARGET} + # # universe #