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

Fix up firmware package rollback 

If we removed a firmware package, also remove the link in /firmware
This commit is contained in:
Steve McIntyre 2021-07-25 15:57:45 +01:00 committed by Steve McIntyre
parent 3d15315df4
commit 047ec2b360
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/make_disc_trees.pl
View File

@ -172,6 +172,7 @@ if ($archlist =~ /m68k/ || $archlist =~ /powerpc/) {
print "Starting to lay out packages into images:\n";
# Read in the list of packages that we're expecting to include
if (-e "$bdir/firmware-packages") {
open(FWLIST, "$bdir/firmware-packages") or die "Unable to read firmware-packages file!\n";
while (defined (my $pkg = <FWLIST>)) {
@ -1431,6 +1432,11 @@ sub add_packages {
if (!($arch eq "source")) {
$total_blocks -= remove_trans_desc_entry($dir, $arch, $in_backports, $package_info);
}
if ($firmware_package{$pkgname}) {
msg_ap(0, "Remove symlink for fw package $pkgname in /firmware\n");
unlink("$dir/firmware/" . basename($file));
}
foreach my $file (@files) {
my $missing = 0;