From nobody Wed Oct 8 03:54:24 2025 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 4chJzN4Zv5z6B9Fb; Wed, 08 Oct 2025 03:54:24 +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 4chJzN2CMQz3tCG; Wed, 08 Oct 2025 03:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895664; 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=B9u4woIZ7w5I8ibVeF4szXRgsexueS/PMnw9MJvhlus=; b=Xs6KUC30eZSU05vwZubQk+st9S0a0vqJeP53GzmymF/qlcuhb/up9U0otabpyR+Uv+RdL0 tuZqzvkx9XTf17lVQzRsrsobwGKSTFpoBayzCPlh+TbozRAAse4W5+suWtxKDzD4OE2jI/ P5mcNM1wlir+Wd88aif/lP8itfmYYPxkv1kgdawlsHxX7EqiV+Avg8rKZeRma/Ayf2YZlh iRd5D3skGZplx4M0uLa6MQ3RLxaqXiHsDvEqb8QcGonlsn/fq9XlMeUfifFU4Tl6rRBzEL aOUmQzdl11cSC2Se+j86lwRGfdXGwIge/0my3rtoemdix37VSDtNfNXJwfWskw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895664; 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=B9u4woIZ7w5I8ibVeF4szXRgsexueS/PMnw9MJvhlus=; b=VExT9HcXUkWAzcznQVzI0rci8fRXi2pq/3xJuWrZCmuKHHmb+nhNYOKSbvPFs613QQqqwL Ct1CG5mshQaMpZ8FgAjIr/lkDCplLoKI04b1lmCeUl0V5lk2/1iGiO7bUrOTdN+wdw2/cv 2yfDikGlF+cLGwjhBXReRgjykbcF5SRejH67oO1LiW2nX8pvABYRkdUQ+f2VRTN8fLs7Lq 3wZZQg/fx1WP5rLh2VfOm+aOgumf/Gs9SigeHxrJJlVJaNSxc1bxAanffRX9HAcOyy63AR Gc4XHEbMHMFHA62c1r0GzDrJhiUfvJem23P/TROMvXkfjnSR1av43rr4w95TCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759895664; a=rsa-sha256; cv=none; b=cjWaAEo3mgCMl86aNfZ4smCwQo6OuB85fdqbIkwdNB7CBuoiq57/qF6E8ZQmNOCpR2MQjC 2XvDPQf+fd/n37Vk0j1t0f1GUthptE88dCtFvWW8h6kxvSNkGe1/X84KaKLC/1hTkfqCXS D202eV+I5p9hiRPDJGHnhSUEaAlFqL2MOedWYfyx1UgBSRe0X5C2FsKvKvlhFV19vSKA4n lzjc68YTNPBbL6eqD70u8QqiNsa9LPUp5AQb3mAE+vJZ0B3nUGkiF0D18gl5PFR9I0YicA 7zDScpaGZu68ESCm4ZahPC7aTOa1PTjSG5MZX0wbF+6/VqmM4MqG+6xZ6h54aw== 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 4chJzN1jJ3zpJ; Wed, 08 Oct 2025 03:54:24 +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 5983sOZo078617; Wed, 8 Oct 2025 03:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5983sORs078614; Wed, 8 Oct 2025 03:54:24 GMT (envelope-from git) Date: Wed, 8 Oct 2025 03:54:24 GMT Message-Id: <202510080354.5983sORs078614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: f7dc7d7af368 - main - Makefile: Force DISTDIR=/ for (update-)packages 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7dc7d7af3683836fcca68018a678b242d2e2620 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f7dc7d7af3683836fcca68018a678b242d2e2620 commit f7dc7d7af3683836fcca68018a678b242d2e2620 Author: Lexi Winter AuthorDate: 2025-10-08 03:22:32 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 03:22:32 +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 --- 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 #