Skip to content

Commit

Permalink
Debian: add non-free-firmware repo component
Browse files Browse the repository at this point in the history
Debian 12 "bookworm" added the non-free-firmware repository component.
This commit adds that component to examples, tests, and backports for
Debian 12. Reference: https://wiki.debian.org/Firmware
  • Loading branch information
kenyon committed Oct 4, 2024
1 parent cc4ae78 commit 3c7161e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ apt::source { 'debian_unstable':
comment => 'This is the iWeb Debian unstable mirror',
location => 'http://debian.mirror.iweb.ca/debian/',
release => 'unstable',
repos => 'main contrib non-free',
repos => 'main contrib non-free non-free-firmware',
pin => '-10',
key => {
'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
Expand Down Expand Up @@ -235,7 +235,7 @@ apt::sources:
comment: 'This is the iWeb Debian unstable mirror'
location: 'http://debian.mirror.iweb.ca/debian/'
release: 'unstable'
repos: 'main contrib non-free'
repos: 'main contrib non-free non-free-firmware'
pin: '-10'
key:
id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553'
Expand Down
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ Data type: `Optional[String[1]]`
Specifies a component of the Apt repository containing the backports to manage. Used in populating the `sources.list` configuration file.
Default value for Debian and Ubuntu varies:

- Debian: 'main contrib non-free'
- Debian: 'main contrib non-free non-free-firmware'

- Ubuntu: 'main universe multiverse restricted'

Expand Down
3 changes: 3 additions & 0 deletions data/os/Debian/12.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
apt::backports:
location: http://deb.debian.org/debian
repos: main contrib non-free non-free-firmware
4 changes: 2 additions & 2 deletions examples/source.pp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
apt::source { 'debian_testing':
location => 'http://debian.mirror.iweb.ca/debian/',
release => 'testing',
repos => 'main contrib non-free',
repos => 'main contrib non-free non-free-firmware',
key => {
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
server => 'keyserver.ubuntu.com',
Expand All @@ -26,7 +26,7 @@
apt::source { 'debian_unstable':
location => 'http://debian.mirror.iweb.ca/debian/',
release => 'unstable',
repos => 'main contrib non-free',
repos => 'main contrib non-free non-free-firmware',
key => {
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
server => 'keyserver.ubuntu.com',
Expand Down
2 changes: 1 addition & 1 deletion manifests/backports.pp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Specifies a component of the Apt repository containing the backports to manage. Used in populating the `sources.list` configuration file.
# Default value for Debian and Ubuntu varies:
#
# - Debian: 'main contrib non-free'
# - Debian: 'main contrib non-free non-free-firmware'
#
# - Ubuntu: 'main universe multiverse restricted'
#
Expand Down
14 changes: 7 additions & 7 deletions spec/classes/apt_backports_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
family: 'Debian',
name: 'Debian',
release: {
full: '11.8',
major: '11',
minor: '8'
full: '12.5',
major: '12',
minor: '5'
},
distro: {
codename: 'bullseye',
codename: 'bookworm',
id: 'Debian'
}
}
Expand All @@ -28,11 +28,11 @@
it {
expect(subject).to contain_apt__source('backports').with(
location: 'http://deb.debian.org/debian',
repos: 'main contrib non-free',
release: 'bullseye-backports',
repos: 'main contrib non-free non-free-firmware',
release: 'bookworm-backports',
pin: {
'priority' => 200,
'release' => 'bullseye-backports'
'release' => 'bookworm-backports'
},
keyring: '/usr/share/keyrings/debian-archive-keyring.gpg',
)
Expand Down

0 comments on commit 3c7161e

Please sign in to comment.