Date: Thu, 22 May 2025 19:29:27 GMT From: Lexi Winter <ivy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: fb6b1a797349 - stable/14 - package: fix dependency generation Message-ID: <202505221929.54MJTRwo061632@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=fb6b1a797349992d8f166a2724eab2caf59abe28 commit fb6b1a797349992d8f166a2724eab2caf59abe28 Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2024-04-29 14:30:46 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505221929.54MJTRwo061632>