Skip to content

Commit a714eb8

Browse files
minimum2scpminimum2scp
authored
Merge pull request #1062 from minimum2scp/features/add_non-free-firmware_component
baseimage: add non-free-firmware component in apt line
2 parents 50fe4ac + 998820c commit a714eb8

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎baseimage/build/etc/apt/sources.list

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
## testing
1313
##
1414

15-
#deb http://deb.debian.org/debian/ testing main contrib non-free
16-
#deb-src http://deb.debian.org/debian/ testing main contrib non-free
15+
#deb http://deb.debian.org/debian/ testing main contrib non-free non-free-firmware
16+
#deb-src http://deb.debian.org/debian/ testing main contrib non-free non-free-firmware
1717

1818
##
1919
## sid
2020
##
2121

22-
deb http://deb.debian.org/debian/ sid main contrib non-free
23-
#deb-src http://deb.debian.org/debian/ sid main contrib non-free
22+
deb http://deb.debian.org/debian/ sid main contrib non-free non-free-firmware
23+
#deb-src http://deb.debian.org/debian/ sid main contrib non-free non-free-firmware
2424

2525
##
2626
## experimental
2727
##
2828

29-
#deb http://deb.debian.org/debian/ experimental main contrib non-free
30-
#deb-src http://deb.debian.org/debian/ experimental main contrib non-free
29+
#deb http://deb.debian.org/debian/ experimental main contrib non-free non-free-firmware
30+
#deb-src http://deb.debian.org/debian/ experimental main contrib non-free non-free-firmware
3131

‎spec/baseimage/00base_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
its(:content) { should match apt_line_re[false, 'deb', 'http://security.debian.org/debian-security', 'stable-security', 'main', 'contrib', 'non-free'] }
3939
its(:content) { should match apt_line_re[false, 'deb-src', 'http://security.debian.org/debian-security', 'stable-security', 'main', 'contrib', 'non-free'] }
4040
## testing
41-
its(:content) { should match apt_line_re[false, 'deb', 'http://deb.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free'] }
42-
its(:content) { should match apt_line_re[false, 'deb-src', 'http://deb.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free'] }
41+
its(:content) { should match apt_line_re[false, 'deb', 'http://deb.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
42+
its(:content) { should match apt_line_re[false, 'deb-src', 'http://deb.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
4343
## sid
44-
its(:content) { should match apt_line_re[true, 'deb', 'http://deb.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free'] }
45-
its(:content) { should match apt_line_re[false, 'deb-src', 'http://deb.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free'] }
44+
its(:content) { should match apt_line_re[true, 'deb', 'http://deb.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
45+
its(:content) { should match apt_line_re[false, 'deb-src', 'http://deb.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
4646
## experimental
47-
its(:content) { should match apt_line_re[false, 'deb', 'http://deb.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free'] }
48-
its(:content) { should match apt_line_re[false, 'deb-src', 'http://deb.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free'] }
47+
its(:content) { should match apt_line_re[false, 'deb', 'http://deb.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
48+
its(:content) { should match apt_line_re[false, 'deb-src', 'http://deb.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
4949
end
5050

5151
describe file('/etc/apt/apt.conf.d/proxy.conf') do
@@ -208,14 +208,14 @@
208208
its(:content) { should match apt_line_re[false, 'deb', 'http://security.debian.org/debian-security', 'stable-security', 'main', 'contrib', 'non-free'] }
209209
its(:content) { should match apt_line_re[false, 'deb-src', 'http://security.debian.org/debian-security', 'stable-security', 'main', 'contrib', 'non-free'] }
210210
## testing
211-
its(:content) { should match apt_line_re[false, 'deb', 'http://ftp.jp.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free'] }
212-
its(:content) { should match apt_line_re[false, 'deb-src', 'http://ftp.jp.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free'] }
211+
its(:content) { should match apt_line_re[false, 'deb', 'http://ftp.jp.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
212+
its(:content) { should match apt_line_re[false, 'deb-src', 'http://ftp.jp.debian.org/debian/', 'testing', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
213213
## sid
214-
its(:content) { should match apt_line_re[true, 'deb', 'http://ftp.jp.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free'] }
215-
its(:content) { should match apt_line_re[false, 'deb-src', 'http://ftp.jp.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free'] }
214+
its(:content) { should match apt_line_re[true, 'deb', 'http://ftp.jp.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
215+
its(:content) { should match apt_line_re[false, 'deb-src', 'http://ftp.jp.debian.org/debian/', 'sid', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
216216
## experimental
217-
its(:content) { should match apt_line_re[false, 'deb', 'http://ftp.jp.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free'] }
218-
its(:content) { should match apt_line_re[false, 'deb-src', 'http://ftp.jp.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free'] }
217+
its(:content) { should match apt_line_re[false, 'deb', 'http://ftp.jp.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
218+
its(:content) { should match apt_line_re[false, 'deb-src', 'http://ftp.jp.debian.org/debian/', 'experimental', 'main', 'contrib', 'non-free', 'non-free-firmware'] }
219219
end
220220

221221

0 commit comments

Comments
 (0)