From nobody Mon Mar 27 11:59:48 2023 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 4PlWZr6xpCz42BD0; Mon, 27 Mar 2023 11:59:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlWZr6PS1z3QQw; Mon, 27 Mar 2023 11:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679918388; 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=CpN7VIth5NNHLZH3SYbVVwMIi6xC7uOD9I+EZ56hA4M=; b=i9Xth87MdfKlmPUIjZ0NEuFgCH9GS/ZJ0m6bdskr95RVfM7fyWpZGLcwepOeCEYBT9BHMu skkmstbvV3VXuB7HQwsMNCXXJeOmdzDn1cxjQpb5x/ZSXMmljOeE5NpGqRE1Ft0eACfb5a 0PHxGvDP8pv3kRWlm46di+QvqUkbbSFyeCXVDpjZQdTo9+0Fp69rY+FTESQeVsJ8gjLeOh txE/dPl5/iC6N8cQunNrzNI764MnBQjxsrxucbQhj1o/0j7h76x57FM+acQo2SopQPosXA ixXoeNunNDh7BcmF72yA+ryQcgTdrH7ujfmli/ZnQHgKP+uOgP0M6E9Yd5fIbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679918388; 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=CpN7VIth5NNHLZH3SYbVVwMIi6xC7uOD9I+EZ56hA4M=; b=NnApXAE1VYbFLYin3WCtnsTqT4+muXLV8KACJL5YOUTEnSqmAG/Cg1Ldx/njw+D3OheaO0 XkISiYcxy58HgnLLVLijU1HsYhy/xp0kIn9A3I5EPk+VvCGZssYozNbjH3khGlEot/ea8L CXdPtCYRryBXcyW7VRx9cCmeKUClOpYOXfd0GdKRBE18VSI5xvcJw85XNEXoYAGVN9h5y3 E0gBu3bknxKM+IUlvEJuLg3j9UhDUfLYi3tbSXkbeRth62Y/i1okP4u+fxeMWhwnY4D8wF 3PmOR9ScsethQsHxfg+v2ERMXrqs+zlwr/GDuGL5/2I8I7j96J7+auEuIGAiKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679918388; a=rsa-sha256; cv=none; b=K0NXos0HMDd4yvs6dZVS7jjA6l4KIeEr5Gl+t6s0QTet0Z+ZG9f1mGlpRY0gbD2rFaMWI7 uW50ehi6lszpp72teyTOlqWGYceg50ZzyzbvN8i4xZocHAuYfQMdSqqtRPAvifJVU5rfsd K0F/Nsfgsu26Cpjl9pWrFyLhOesws9slozufXx/+YfukSw9DqEf/8OyWGpFC9inC0IOWQC y6wYpZS1G3tQQ73Lu+R97CIVzB067Yf1BSuk3fN93PTUgqza4/DKKZBVA4lW5npLHoDZ50 E+U55yOAWvK0HKVc2XiOdKA3CmPk3cvrXmeg00oXfvKnJi4CcnmJeJDkWqW+8w== 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 4PlWZr5LFFzLwr; Mon, 27 Mar 2023 11:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RBxm5D008905; Mon, 27 Mar 2023 11:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBxmkj008904; Mon, 27 Mar 2023 11:59:48 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:59:48 GMT Message-Id: <202303271159.32RBxmkj008904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 12496806098d - main - kern.post.mk: fix PORTSDIR handling 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12496806098d9d9915817edcd0df17cdd27f60c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=12496806098d9d9915817edcd0df17cdd27f60c8 commit 12496806098d9d9915817edcd0df17cdd27f60c8 Author: Yuri Pankov AuthorDate: 2023-03-27 11:42:31 +0000 Commit: Yuri Pankov CommitDate: 2023-03-27 11:57:57 +0000 kern.post.mk: fix PORTSDIR handling Using subshell's PORTSDIR variable (via $${PORTSDIR}}) seems to be only working if PORTSDIR is specified directly on the make command line. Use ${PORTDIR} here instead so that setting the variable in /etc/{make,src,src-env}.conf would work (also works for variable being set on command line or in the environment). PR: 268299 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D37868 --- sys/conf/kern.post.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index da234d5b88a6..c368d5f40df8 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -133,7 +133,7 @@ PORTSMODULESENV=\ all: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (all)" - cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build + cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build .endfor .for __target in install reinstall clean @@ -141,7 +141,7 @@ ${__target}: ports-${__target} ports-${__target}: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (${__target})" - cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/(re)?install/deinstall reinstall/} + cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/(re)?install/deinstall reinstall/} .endfor .endfor .endif