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

Dont generate fw pattern file if DEP11 is set to 0

This commit is contained in:
Arnaud Rebillout 2024-02-01 21:21:35 +00:00 committed by Steve McIntyre
parent 2603f4c537
commit 3752fd161a
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/make_disc_trees.pl
View File

@ -93,7 +93,9 @@ $extranonfree = read_env('EXTRANONFREE', 0);
$nonfree = read_env('NONFREE', 0); $nonfree = read_env('NONFREE', 0);
$contrib = read_env('CONTRIB', 0); $contrib = read_env('CONTRIB', 0);
$use_local = read_env('LOCAL', 0); $use_local = read_env('LOCAL', 0);
my $dep11 = read_env('DEP11', 1);
my $list = "$tdir/list"; my $list = "$tdir/list";
my $bdir = "$tdir/$codename"; my $bdir = "$tdir/$codename";
my $log = "$bdir/make_disc_tree.log"; my $log = "$bdir/make_disc_tree.log";
@ -1210,8 +1212,6 @@ sub add_firmware_stuff {
local $_ = shift; local $_ = shift;
my ($p, $file, $section, $component, $dep11_dir); my ($p, $file, $section, $component, $dep11_dir);
my $blocks_added = 0; my $blocks_added = 0;
my @args = ("$basedir/tools/generate_firmware_patterns",
"--output-dir", "$dir/firmware/dep11");
m/^Package: (\S+)/m and $p = $1; m/^Package: (\S+)/m and $p = $1;
m/^Section: (\S+)/m and $section = $1; m/^Section: (\S+)/m and $section = $1;
@ -1259,16 +1259,21 @@ sub add_firmware_stuff {
$blocks_added -= get_file_blocks("$dir/firmware/dep11/$p.component"); $blocks_added -= get_file_blocks("$dir/firmware/dep11/$p.component");
} }
msg_ap(0, "(Maybe) generate fw pattern file $dir/firmware/dep11/$p.patterns\n"); # Do only if dep11 is enabled
push(@args, "--package", "$p"); if ($dep11) {
push(@args, "$dep11_dir/Components-$arch.yml.gz"); msg_ap(0, "(Maybe) generate fw pattern file $dir/firmware/dep11/$p.patterns\n");
system(@args) == 0 or die "generate_firmware_patterns failed: $?"; my @args = ("$basedir/tools/generate_firmware_patterns",
if (-f "$dir/firmware/dep11/$p.patterns") { "--output-dir", "$dir/firmware/dep11");
$blocks_added += get_file_blocks("$dir/firmware/dep11/$p.patterns"); push(@args, "--package", "$p");
# Make sure apt-setup can be configured appropriately: push(@args, "$dep11_dir/Components-$arch.yml.gz");
write_file("$dir/firmware/dep11/$p.component", $component) system(@args) == 0 or die "generate_firmware_patterns failed: $?";
or die "unable to create $dir/firmware/dep11/$p.component"; if (-f "$dir/firmware/dep11/$p.patterns") {
$blocks_added += get_file_blocks("$dir/firmware/dep11/$p.component"); $blocks_added += get_file_blocks("$dir/firmware/dep11/$p.patterns");
# Make sure apt-setup can be configured appropriately:
write_file("$dir/firmware/dep11/$p.component", $component)
or die "unable to create $dir/firmware/dep11/$p.component";
$blocks_added += get_file_blocks("$dir/firmware/dep11/$p.component");
}
} }
# Find the current size of the firmware Contents file # Find the current size of the firmware Contents file