git: 6e27b15e6aee - releng/14.3 - package: fix dependency generation
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 23 May 2025 00:04:28 UTC
The branch releng/14.3 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e27b15e6aee10c72dbf8247a90b87a7c0b3c241
commit 6e27b15e6aee10c72dbf8247a90b87a7c0b3c241
Author: Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2024-04-29 14:30:46 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
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
}