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.

Sign up for GitHub

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

(RE-16550): Debian 12 bookworm FOSS build target #629

Merged
merged 3 commits into from
Aug 26, 2024
Merged

(RE-16550): Debian 12 bookworm FOSS build target #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7c9eba
(maint) drop platform 6 fpm support
h0tw1r3 Apr 20, 2024
8451c73
(maint) debian platforms simplify java depends
h0tw1r3 Apr 20, 2024
4e485d8
(maint) add Debian 12 bookworm as a FOSS build target
h0tw1r3 Apr 20, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).

## [Unreleased]
* Drop platform 6 fpm support
* On all Debian platforms simplify java depends, allow 17 or 11, prefer 17
* Add Debian 12 bookworm as a FOSS build target

## [2.6.1]
* Fix the ability to add a resources directory to a project with :include-dir by copying the resources to the staging directory directly.
Expand Down
2 changes: 1 addition & 1 deletion resources/puppetlabs/lein-ezbake/template/foss/ext/build_defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
default_cow: 'base-bionic-i386.cow'
cows: 'base-bionic-i386.cow base-buster-i386.cow base-focal-i386.cow base-bullseye-i386.cow base-jammy-i386.cow'
cows: 'base-bionic-i386.cow base-buster-i386.cow base-focal-i386.cow base-bullseye-i386.cow base-jammy-i386.cow base-bookworm-i386.cow'
pbuild_conf: '/etc/pbuilderrc'
packager: 'puppetlabs'
gpg_key: '4528B6CD9E61EF26'
Expand Down
20 changes: 3 additions & 17 deletions resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
else
fail "Unrecognized el os version #{options.os_version}"
end
when 6..7
when 7
'java-1.8.0-openjdk-headless'
else
fail "Unknown Puppet Platform Version #{options.platform_version}"
Expand All @@ -219,7 +219,7 @@
case options.platform_version
when 8
'java-11-openjdk-headless'
when 6..7
when 7
if options.os_version > 12
'java-11-openjdk-headless'
else
Expand Down Expand Up @@ -328,21 +328,7 @@
end

if ! options.is_pe
options.java =
case options.platform_version
when 8
if options.dist =~ /buster|bullseye|bookworm|bionic|focal|jammy/
'openjdk-17-jre-headless | openjdk-11-jre-headless'
end
when 6..7
if options.dist =~ /buster|bullseye/ # debian 10+ uses java11
'openjdk-11-jre-headless'
else
'openjdk-8-jre-headless'
end
else
fail "Unknown Puppet Platform Version #{options.platform_version}"
end
options.java = 'openjdk-17-jre-headless | openjdk-11-jre-headless'
end

fpm_opts << '--deb-build-depends cdbs'
Expand Down
Loading