Skip to content

Commit 3c7161e

Browse files
committed
Debian: add non-free-firmware repo component
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
1 parent cc4ae78 commit 3c7161e

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ apt::source { 'debian_unstable':
181181
comment => 'This is the iWeb Debian unstable mirror',
182182
location => 'http://debian.mirror.iweb.ca/debian/',
183183
release => 'unstable',
184-
repos => 'main contrib non-free',
184+
repos => 'main contrib non-free non-free-firmware',
185185
pin => '-10',
186186
key => {
187187
'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
@@ -235,7 +235,7 @@ apt::sources:
235235
comment: 'This is the iWeb Debian unstable mirror'
236236
location: 'http://debian.mirror.iweb.ca/debian/'
237237
release: 'unstable'
238-
repos: 'main contrib non-free'
238+
repos: 'main contrib non-free non-free-firmware'
239239
pin: '-10'
240240
key:
241241
id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553'

REFERENCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ Data type: `Optional[String[1]]`
507507
Specifies a component of the Apt repository containing the backports to manage. Used in populating the `sources.list` configuration file.
508508
Default value for Debian and Ubuntu varies:
509509

510-
- Debian: 'main contrib non-free'
510+
- Debian: 'main contrib non-free non-free-firmware'
511511

512512
- Ubuntu: 'main universe multiverse restricted'
513513

data/os/Debian/12.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
apt::backports:
2+
location: http://deb.debian.org/debian
3+
repos: main contrib non-free non-free-firmware

examples/source.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
apt::source { 'debian_testing':
1717
location => 'http://debian.mirror.iweb.ca/debian/',
1818
release => 'testing',
19-
repos => 'main contrib non-free',
19+
repos => 'main contrib non-free non-free-firmware',
2020
key => {
2121
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
2222
server => 'keyserver.ubuntu.com',
@@ -26,7 +26,7 @@
2626
apt::source { 'debian_unstable':
2727
location => 'http://debian.mirror.iweb.ca/debian/',
2828
release => 'unstable',
29-
repos => 'main contrib non-free',
29+
repos => 'main contrib non-free non-free-firmware',
3030
key => {
3131
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
3232
server => 'keyserver.ubuntu.com',

manifests/backports.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Specifies a component of the Apt repository containing the backports to manage. Used in populating the `sources.list` configuration file.
2121
# Default value for Debian and Ubuntu varies:
2222
#
23-
# - Debian: 'main contrib non-free'
23+
# - Debian: 'main contrib non-free non-free-firmware'
2424
#
2525
# - Ubuntu: 'main universe multiverse restricted'
2626
#

spec/classes/apt_backports_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
family: 'Debian',
1414
name: 'Debian',
1515
release: {
16-
full: '11.8',
17-
major: '11',
18-
minor: '8'
16+
full: '12.5',
17+
major: '12',
18+
minor: '5'
1919
},
2020
distro: {
21-
codename: 'bullseye',
21+
codename: 'bookworm',
2222
id: 'Debian'
2323
}
2424
}
@@ -28,11 +28,11 @@
2828
it {
2929
expect(subject).to contain_apt__source('backports').with(
3030
location: 'http://deb.debian.org/debian',
31-
repos: 'main contrib non-free',
32-
release: 'bullseye-backports',
31+
repos: 'main contrib non-free non-free-firmware',
32+
release: 'bookworm-backports',
3333
pin: {
3434
'priority' => 200,
35-
'release' => 'bullseye-backports'
35+
'release' => 'bookworm-backports'
3636
},
3737
keyring: '/usr/share/keyrings/debian-archive-keyring.gpg',
3838
)

0 commit comments

Comments
 (0)