From nobody Tue Sep 3 14:55:02 2024 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 4WypZH1TgQz5TMld; Tue, 03 Sep 2024 14:55:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WypZH0hNwz4wpm; Tue, 3 Sep 2024 14:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725375303; 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=5bjVY8Fp78RFv0HBmWsPiIQbL32+VclYorvjvh4F3cM=; b=P37VCCi6LSejBZS112up1EYMFnftlEzmeZ9fvpTc7QGTS7iunbBTbFtyR9nt1PI0hoZrFd BpDhsGqOaGET1TBNaLgqHDlwC73kemq6JM/te8FSwHuQOBRShy33/qgEZefzHKeOBbodNG 8Dd3Yd7omU7OMVTuyxqVWCGw84wHlfpFM6vRB2fMGFa69zoRnomfc5g4r6Xa5O215YBj62 GP8QJnTOPea673O8JMK4tZVDwmTGUeL7ALNdavrf8J6uWDcge30erchjou66wqvrHmRDpz 0CkjFfZeHlqr7BA0BoUi0mkeXK19D8uj1oFLLNMnsjyYUlhIyW+mJrqqTVrw9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725375303; a=rsa-sha256; cv=none; b=NLEk15adg3pCxKua3XSz3Hx7jakVewouwRtzvp8fVS7V0LKahHeVqaJpGIqAkizL9LhAeZ DYlgYQhdX+9b4o8jC+kjP+t72o879Y3OdEFtLLyCOHPHoOLD/8Uzaq6MX2bUpVQaOXGqs6 I1r+41FzLL4j/ai9T04pPKqjEDQTfMNVkqpIbFIo/GFZYlKSSXBW877RH4FH0MFTeyWlXr 9/1Xm/2mKEG+i9GMVJ8Tz/Bxxc5uMLwDbYqbe1yUndsFdtbx86FQSS4EvqwTxEAPZZg8dW KV8wRTbhO9E8bxb5JN+kIp/Krtr6wdkLWBCGAhiaYzmBVLhlVYXK31iezCXn9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725375303; 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=5bjVY8Fp78RFv0HBmWsPiIQbL32+VclYorvjvh4F3cM=; b=Unh1wcURZ4+80B4wrC6FmMSWI5Ge1EyVajB/uwCuJdkFKmxm2RRMNsVFAq3E6Lda7VoHjy /BOtJDjFoUDp/+JfRj1NK2XiNyWhAh9XR4Pf5Fzbs3u/PZWL5+yQz9umYU0hkGWLmT8/Wx tQmMUDLyrzANAO1M/kewbe5nv1Q0DTO699RtNY8HSQ39st5hanzQkKFPbp/qi3bUOr8T/I 1sg9YNEuNurx3neJcnTjmQa7n7g8mjnFm3kU8a25lagk+HaiTlkaVmvOEMj6Dc3S9q8LOs rDjTCo+Z9GGCJ3e3FdSHeZLLhxsmA8MzUT8xRM7/g0pO0GeueFuC5h9LesgI0A== 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 4WypZH0Jcxzl7t; Tue, 3 Sep 2024 14:55:03 +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 483Et2W8070685; Tue, 3 Sep 2024 14:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483Et2qc070682; Tue, 3 Sep 2024 14:55:02 GMT (envelope-from git) Date: Tue, 3 Sep 2024 14:55:02 GMT Message-Id: <202409031455.483Et2qc070682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e6c6f46dd5ea - stable/14 - pkgbase: Avoid hard-coding the package prefix in generate-ucl.sh 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6c6f46dd5ea100f291b49d9d580283d127d54db Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e6c6f46dd5ea100f291b49d9d580283d127d54db commit e6c6f46dd5ea100f291b49d9d580283d127d54db Author: Mark Johnston AuthorDate: 2024-08-26 20:46:53 +0000 Commit: Mark Johnston CommitDate: 2024-09-03 14:54:43 +0000 pkgbase: Avoid hard-coding the package prefix in generate-ucl.sh MFC after: 1 week Sponsored by: Innovate UK (cherry picked from commit b4dd5ff5f4f159a566c64e3348e67c33b80f2bbf) --- release/packages/generate-ucl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index c7147a97a868..ec9cd0149228 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -133,7 +133,7 @@ main() { echo 'deps: {' >> ${uclfile} for dep in ${pkgdeps}; do cat <> ${uclfile} - FreeBSD-${dep}: { + ${PKG_NAME_PREFIX}-${dep}: { origin: "base", version: "${PKG_VERSION}" }