janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

pkg.sh: Fix broken version macro expansion #92

Merged
Jan Lindemann merged 1 commit from jan/feature/20260909-pkg-sh-fix-broken-version-macro-expansion into master 2026-09-09 15:55:39 +02:00 AGit
Conversation 0 Commits 1 Files changed 2 +13 -17
Jan Lindemann commented 2026-09-09 15:47:33 +02:00
Owner
Copy link

pkg.sh: Fix broken version macro expansion

pkg-dist.mk queries the package relations with --dont-expand-version-macros, and build_pkg() expanded the remaining VERSION and VERSION-REVISION macros with a local sed-based expand_version_macros(). That substitutes the version of the project being built for every macro, instead of the version of the dependency the macro refers to.

Drop --dont-expand-version-macros from the proj_query calls so the macros resolve to the dependency's own version, and remove expand_version_macros() from build_pkg(), which passes the PKG_* variables to rpmbuild as they are queried.

#### pkg.sh: Fix broken version macro expansion pkg-dist.mk queries the package relations with --dont-expand-version-macros, and build_pkg() expanded the remaining VERSION and VERSION-REVISION macros with a local sed-based expand_version_macros(). That substitutes the version of the project being built for every macro, instead of the version of the dependency the macro refers to. Drop --dont-expand-version-macros from the proj_query calls so the macros resolve to the dependency's own version, and remove expand_version_macros() from build_pkg(), which passes the PKG_* variables to rpmbuild as they are queried.
pkg.sh: Fix broken version macro expansion
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 3m52s
Details
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 4m12s
Details
CI / Packaging test (pull_request) Successful in 0s
Details
af31e80678
 
pkg-dist.mk queries the package relations with
--dont-expand-version-macros, and build_pkg() expanded the remaining
VERSION and VERSION-REVISION macros with a local sed-based
expand_version_macros(). That substitutes the version of the project being
built for every macro, instead of the version of the dependency the macro
refers to.

Drop --dont-expand-version-macros from the proj_query calls so the macros
resolve to the dependency's own version, and remove expand_version_macros()
from build_pkg(), which passes the PKG_* variables to rpmbuild as they are
queried.

Signed-off-by: Jan Lindemann <jan@janware.com>
Jan Lindemann scheduled this pull request to auto merge when all checks succeed 2026-09-09 15:47:35 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
janware/jw-pkg!92
No description provided.