Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(bugfix) rpm install-time macro expansion #631

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).

## [Unreleased]
* Use RPM install-time macro expansion in scriptlets
* Add AmazonLinux 2023 as a FOSS build target
* Drop platform 6 fpm support
* On all Debian platforms simplify java depends, allow 17 or 11, prefer 17
Expand Down
2 changes: 2 additions & 0 deletions resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
# rpm specific options
if options.output_type == 'rpm'

shared_opts << "--rpm-macro-expansion"
shared_opts << "--rpm-digest sha256"
shared_opts << "--rpm-rpmbuild-define 'rpmversion #{options.version}'"
fpm_opts << "--rpm-rpmbuild-define '_app_logdir #{options.app_logdir}'"
Expand Down Expand Up @@ -263,6 +264,7 @@

if options.systemd_el == 1
fpm_opts << "--depends systemd"
fpm_opts << "--depends systemd-rpm-macros"
end

if options.systemd_sles == 1
Expand Down
Loading