Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generate_firmware_patterns: Drop support for the temporary --test option.

This commit is contained in:
Cyril Brulebois 2021-08-22 16:17:41 +02:00
parent 5e3dec1796
commit 897bf4754d
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -7,6 +7,10 @@ debian-cd (3.1.36) UNRELEASED; urgency=medium
* Use $CODENAME/updates for security pre-bullseye, or * Use $CODENAME/updates for security pre-bullseye, or
$CODENAME-security for bullseye onwards. $CODENAME-security for bullseye onwards.
[ Cyril Brulebois ]
* generate_firmware_patterns: Drop support for the temporary --test
option.
-- Steve McIntyre <93sam@debian.org> Mon, 26 Jul 2021 01:02:03 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 26 Jul 2021 01:02:03 +0100
debian-cd (3.1.35) unstable; urgency=medium debian-cd (3.1.35) unstable; urgency=medium

11
tools/generate_firmware_patterns
View File

@ -10,8 +10,7 @@
# #
# We're limiting ourselves to packages announcing Type: firmware, and # We're limiting ourselves to packages announcing Type: firmware, and
# they need to include such information in their metadata, e.g. # they need to include such information in their metadata, e.g.
# src:firmware-nonfree; the --test option can be used until such # src:firmware-nonfree.
# packages appear in the archive.
# #
# See: https://salsa.debian.org/kernel-team/firmware-nonfree/-/merge_requests/19 # See: https://salsa.debian.org/kernel-team/firmware-nonfree/-/merge_requests/19
@ -24,15 +23,11 @@ use Getopt::Long;
use YAML::XS; use YAML::XS;
# XXX: Drop support for --test once we have the required metadata in
# the archive.
my $output_dir = '.'; my $output_dir = '.';
my $test;
my $verbose; my $verbose;
my $pkgname = "ALL"; my $pkgname = "ALL";
GetOptions( "output-dir=s" => \$output_dir, GetOptions( "output-dir=s" => \$output_dir,
"test" => \$test,
"verbose" => \$verbose, "verbose" => \$verbose,
"package=s" => \$pkgname) "package=s" => \$pkgname)
or die "Error in command line arguments"; or die "Error in command line arguments";
@ -63,10 +58,6 @@ sub process_components {
foreach my $array (Load $content) { foreach my $array (Load $content) {
# XXX: Drop the condition once we have the required metadata # XXX: Drop the condition once we have the required metadata
# in the archive. # in the archive.
if (! $test) {
next if not defined $array->{Type};
next if $array->{Type} ne 'firmware';
}
next if not defined $array->{Provides}; next if not defined $array->{Provides};
next if not defined $array->{Provides}->{modaliases}; next if not defined $array->{Provides}->{modaliases};