From nobody Fri Oct 10 07:17:39 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 4cjdNz39NRz6BVX6; Fri, 10 Oct 2025 07:17:39 +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 4cjdNz2NXKz3Vmw; Fri, 10 Oct 2025 07:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760080659; 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=jVNHJn1L4sQuDYDtKWznNyqreR7Na4bb1wh/4M1PrME=; b=YfdtRPP0ivRReXk54zTDYH0kWokW6VWoiRfeatZgM+iQyYyx/CyLOYfvR5USSTaFtd2H3D VO6OGODIIE89ef3ihLixDFIG7Hjs6e0SoblvdKru56Y3tk1EOZWsUjSqngq39Y15iWkwGF u90zKUGWvDy3p7ERGWDnDJNyUbVGTKsRJSIZpDRcvOuWRaszU8GAUWx+sIeaSPRLe5VRrz IDrbcODg6gOAhq7nb+QEy0s66JXgxHBTz8X9Og5Llj9p0wOv9taqz0q0RFneHDfWSfWmpY umF9fL01OiWr9Lz2onhn11ze4EOCyIqP+U6I6XkrWBzhxahhqg1giTpSiXgz3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760080659; 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=jVNHJn1L4sQuDYDtKWznNyqreR7Na4bb1wh/4M1PrME=; b=WYc3SUeSDAQSVe26yGy3oqWR0vtA0OCHe3acwI1wnC8T+pok13pRucpaByz2dhJXuuPFpY xu4lw4qhaGoO5+BSJduhcmJ1MPocBSg/3SX+V9C4fj0SNXolaP/h5zNN+5QfPOqY5vESle PJtW84vA9X2LOIv5ZA5n5z77NIcS7pi8+ZTiwEtyiTcIWvrHcugQv/dAnUUAfzlRYCnOB1 3wiBcIXTRquzalb3Wwsj3Y4v5TeBGowAaGRmL7t7AS/f6kd3q2sGhCOXquL1coTspJuUlK 1/02rAxiCHcVVF+pru9wzemPLhug6n3nHsQbHb35eMT+wFAe0MUoNfoaD1T5rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760080659; a=rsa-sha256; cv=none; b=weVgsSQdQgH8HDxtEMOMVW9H4W+rPN6SID7BGknBgVi/Uf91ofVDJjlwnj0zb6od+f+bZj lD33x3A/nWN5zZfyw4MT7XRI93kkvZiiBeHgAAb73cJrCmlkdWEEeCZHFadoTsROrECVIt BXLnt/31gQqkUUnKz2U6V4T4kA81s7zTakIxazpXlJFFZB3ErWKkzuLp5GFbXc27lWVubG UMCGPEzp5xzY+Ym8G+1NUuLR8Il+wVzeMqeU04TpOwaWoi6PX8Dz087BooMKVBfqQa5zsD Q31K2lmQ2t0aPWZnUTAfOuoWvBQoBiL7AA7hfZRuyl+TZQx5mKZyneE2OAycuA== 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 4cjdNz1g9GzsbB; Fri, 10 Oct 2025 07:17:39 +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 59A7Hdln080627; Fri, 10 Oct 2025 07:17:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A7Hdmj080624; Fri, 10 Oct 2025 07:17:39 GMT (envelope-from git) Date: Fri, 10 Oct 2025 07:17:39 GMT Message-Id: <202510100717.59A7Hdmj080624@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: 182eef99ee7b - stable/14 - Makefile: Force DISTDIR=/ for (update-)packages 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 182eef99ee7ba237f7f302ac4a2cda7b9babac23 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=182eef99ee7ba237f7f302ac4a2cda7b9babac23 commit 182eef99ee7ba237f7f302ac4a2cda7b9babac23 Author: Lexi Winter AuthorDate: 2025-10-08 03:22:32 +0000 Commit: Lexi Winter CommitDate: 2025-10-10 06:15:56 +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 1cf7dc888f6b..ba435813fbed 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,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 @@ -529,6 +529,9 @@ kernels: .PHONY worlds: .PHONY @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe +packages update-packages: .PHONY + ${_+_}@cd ${.CURDIR}; ${_MAKE} DISTDIR=/ ${.TARGET} + # # universe #