From nobody Thu May 22 19:29:27 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 4b3JJR3yR0z5x4DK; Thu, 22 May 2025 19:29:27 +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 4b3JJR3DC1z43PW; Thu, 22 May 2025 19:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747942167; 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=A7AEYs+TFG++h65pF9BYTSlPAGG+4/Ew5gJIU0d+KW0=; b=PO8qF4N5bBqeMVsQl6NiTqKtishSZNZfVXFWFIYuGLZl2Z6u4M9KysbhQW3HFmvBSNivEc bPOeLVQNj9itQU02B1XCcKBDK4RwNBEm+0Qn75x3ZMkAW3pLU+zX9X2dDbrSCWHkV1gkLv 7tv8D1hI52JISxo02cTV7RJaAMhnQGvc+0cCvSJqhkghTYxn39jWTlg4QXHbfudOabFDMH HqIedEsASFtTyCC2Lra+bW68xbrVgEf+Dlf8p7anUXYvvSZ5yBWt13HKs+gSzIjj2dnyf1 eQi5IZUjlElP2+akUVWH7bTBSVy2qclOs5FzBb7hmmCIUu4Zqxi/WxjfBOsbqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747942167; 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=A7AEYs+TFG++h65pF9BYTSlPAGG+4/Ew5gJIU0d+KW0=; b=H15VE9061xaNeSYoQ96aHb7ZeQqObvjX8n0ERB2+W+IEUnjXbjf5ZPE5OqMrGeSo9/DNjg trapP5MSf5MEGnI4/PWwCLlMFhBNrqCJJ/rTGJXCF2j7P0OQ2jC0tk26TjPYMNybvz9sCb GhJUuFGiJ+kBzMqXfUWZHpnqUcINbb82+HezTPhXHo60dVObD5yzNc8IqbfoCk5z8HlXMQ ywwnbNAgs+8EPZFLpncAa0KEUnLewzPg7NEo3WnKC13S1J1yj1vakQMPM93/E8buaCBv4D PEBKOU8Eq/xQLrbyF47TlUoDkzjHRHJmAdUuZY2Ope3/Aua9bctHL6caDjbQnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747942167; a=rsa-sha256; cv=none; b=XRBIo9haHgHcudxPIRz/Yg4io0RdfgzO0wUzuZYN8ArRNJiLUW/NmDj555aExNnymO/ArK fkS4AVXrldpeRrF9MBJBZj16ys3sYw6lksNqyB9brzM/gfEYPONwbcPpW07Bsv2z9/kVbY gIdIrjybrt5xQmZ80Ta6SjGbSEL1aa9ymIsB5Y08bGBlhKOBdxndT37vqmLJvIJELxi0kO EGzL4hhYWJG+gxNR1s39ZAXonOcgmIjXfKXKTz+ZcEiDPm94oQoyTYK6WPDszLQD9sDrOl 4m7pc/uDdxH4XPM9Q0ebXuCPLgLyhW98mnMoCdNmyR6Sqy9MMF3aOLcCN8TCvw== 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 4b3JJR2jwfzZvq; Thu, 22 May 2025 19:29:27 +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 54MJTRg7061635; Thu, 22 May 2025 19:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MJTRwo061632; Thu, 22 May 2025 19:29:27 GMT (envelope-from git) Date: Thu, 22 May 2025 19:29:27 GMT Message-Id: <202505221929.54MJTRwo061632@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: fb6b1a797349 - stable/14 - package: fix dependency generation 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: fb6b1a797349992d8f166a2724eab2caf59abe28 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=fb6b1a797349992d8f166a2724eab2caf59abe28 commit fb6b1a797349992d8f166a2724eab2caf59abe28 Author: Lexi Winter AuthorDate: 2024-04-29 14:30:46 +0000 Commit: Lexi Winter CommitDate: 2025-05-22 19:28:01 +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: kevans (mentor, stable/14 mfc) Pull Request: https://github.com/freebsd/freebsd-src/pull/1203 (cherry picked from commit e05b6502f9ca36860236644884f12eff8e3243c4) --- 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 }