git: e05b6502f9ca - main - package: fix dependency generation
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Apr 2024 14:31:59 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=e05b6502f9ca36860236644884f12eff8e3243c4
commit e05b6502f9ca36860236644884f12eff8e3243c4
Author: Lexi Winter <lexi@le-Fay.ORG>
AuthorDate: 2024-04-29 14:30:46 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-04-29 14:31:36 +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.
Reviewed by: des, imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1203
---
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 6549e201e022..27adddad96c0 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -156,7 +156,7 @@ EOF
PKG_WWW "${PKG_WWW}" \
PKG_MAINTAINER "${PKG_MAINTAINER}" \
UCLFILES "${srctree}/release/packages/" \
- ${uclsource} ${uclfile}
+ ${uclfile} ${uclfile}
return 0
}