From nobody Fri May 23 00:04:28 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 4b3QPn244Yz5w7RD; Fri, 23 May 2025 00:04:29 +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 4b3QPn0l5Sz3Sgj; Fri, 23 May 2025 00:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747958669; 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=8LUiBm2VO3EPdXTc7De03V+Mg9Z2wOC+/uttCtQusfw=; b=lhlSuzm04eY5X8zqnxo0oBP68VCUhFHUdMInSbUvMxFsTjGsn8VpKK/2GhoKKdl+izgSI5 DjGxieWyv9HpQHRtM5XU6o88uY1jDbVrCn8fWINejFqrhVwS5GDr1DL6+bFUuHXeU49uvC MJb6cau7nyjkKoezXGJ2aq07R9z8rfLyu7ndz/CTeQWSt1cotuosxice8ECWwnT9Wob8E/ yUvxZDVAEL1IlQs0gADtMLz+LWfa1SVNVbPhqAOWlbsRHyLU2+TuVohqkJJCg8JeNVac9+ B5/Ds88/7CWde/NU9OuDF4vduYBf7okOdmjmvxoM7QMYhcPU6BTJ5YH0AmzTmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747958669; 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=8LUiBm2VO3EPdXTc7De03V+Mg9Z2wOC+/uttCtQusfw=; b=URHLPxBbLTeEAe7q6+MNYS6KXeW0Kd0F2JeCkK0eshIOpmquEzg/yLVBvpWgDyu5RZdbTm mF0vm+QjIA1V2A8pNN1cTvghT2Ys+LLWQxZKW3qmPMZJs8nB8v28nQsDGed4KSoTg6OzEl OeZHIUq+GE9WSu96vz2cdpmZmgXq4sLju1Ob4xGX0K3WJksd8CVqtmkSFI1elN/znMSieC be1lNDoVOHJfcAMmY7swj4bLN3ZST/ENhdaMgFBHXcKfg2YfeoV8m+GoFAcQoco1hUaGHr 2M44zcWA93SF5FhRK/Lnfgzn9cZlv3nslc24+gzqzS5GNG/hOiC1hvCUozwDfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747958669; a=rsa-sha256; cv=none; b=tBprzVcj6HKZ7sBYbDJ/iXebklMR8Y8wjU2FnFQiQXhuK5aY5vYQb9re24jECgwLa5ow5p 6xdRX+IsamRbLM2z9Di+yaLu4iBInRWBeAoMer1YYzQeIlWozrxXYJd8JbgDKPWGFsTmsC 3Gvd6YsZT0omiEcStPfM6HfXYYaj/Q+45zWuiLV376FMF2zkIvG1kOrDXcRSqzPUL6Ah0w wrpS5FMSxtuomdXVDwHC+BggmqUE+oPxXh1nvg6MlqOUHfBMCGLDUzUphltUgEdlb4uk/g Ko1U5XWSIjXnODa6VabSt8UYeqv7UR6GFMLQ0n8v0urcso2ULBeDqeo/4+pFmA== 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 4b3QPn0CjQzjmv; Fri, 23 May 2025 00:04:29 +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 54N04Smg085687; Fri, 23 May 2025 00:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54N04S47085684; Fri, 23 May 2025 00:04:28 GMT (envelope-from git) Date: Fri, 23 May 2025 00:04:28 GMT Message-Id: <202505230004.54N04S47085684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6e27b15e6aee - releng/14.3 - package: fix dependency generation 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 6e27b15e6aee10c72dbf8247a90b87a7c0b3c241 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6e27b15e6aee10c72dbf8247a90b87a7c0b3c241 commit 6e27b15e6aee10c72dbf8247a90b87a7c0b3c241 Author: Lexi Winter AuthorDate: 2024-04-29 14:30:46 +0000 Commit: Colin Percival CommitDate: 2025-05-23 00:04:12 +0000 package: fix dependency generation A bug in release/packages/generate-ucl.sh causes package dependencies (other than shlib depends) to not be generated correctly, meaning packages are missing their dependencies. generate-ucl.sh creates the UCL file by: 1. copying ${uclsource} (template.ucl) to ${uclfile} 2. appending dependencies to ${uclfile} 3. calling generate-ucl.lua on ${uclsource} to create ${uclfile} This breaks because the dependencies added in step 2 are overwritten in step 3. Fix this by calling generate-ucl.lua with ${uclfile} as both the input and output file, so anything we added to ${uclfile} is preserved. PR: 286551 Reviewed by: des, imp Approved by: re (cperciva) Approved by: kevans (mentor, stable/14 mfc) Pull Request: https://github.com/freebsd/freebsd-src/pull/1203 (cherry picked from commit e05b6502f9ca36860236644884f12eff8e3243c4) (cherry picked from commit fb6b1a797349992d8f166a2724eab2caf59abe28) --- 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 ec9cd0149228..064919cb3174 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -153,7 +153,7 @@ EOF PKG_WWW "${PKG_WWW}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ UCLFILES "${srctree}/release/packages/" \ - ${uclsource} ${uclfile} + ${uclfile} ${uclfile} return 0 }