From 4a31c04b815aec1b5ab40001c68f4c1db5ac821c Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Thu, 26 Jan 2023 21:14:20 +0100 Subject: [PATCH] make_disc_trees.pl: remove workaround for missing bookworm/non-free-firmware/dep11 This directory appeared in the archive earlier today. --- tools/make_disc_trees.pl | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl index 1b4c07f7..f1adf9e4 100755 --- a/tools/make_disc_trees.pl +++ b/tools/make_disc_trees.pl @@ -13,7 +13,6 @@ use File::Path qw(make_path remove_tree); use File::Basename; use Compress::Zlib; use File::Slurp; -use feature 'state'; my %pkginfo; my ($basedir, $mirror, $tdir, $codename, $archlist, $mkisofs, $maxcds, @@ -1209,18 +1208,6 @@ sub add_firmware_stuff { $dep11_dir = "$mirror/dists/$codename-backports/$component/dep11"; } - # Workaround for currently-missing dep11 directory for non-free-firmware - # in bookworm, until that's fixed on appstream.debian.org and synchronized - # into the archive: - if ($codename eq 'bookworm' and $component eq 'non-free-firmware' and not -d $dep11_dir) { - state $warned = 0; - if ($warned == 0) { - print "*** APPLYING WORKAROUND for missing $dep11_dir, replacing $codename with sid ***\n"; - $warned = 1; - } - $dep11_dir = "$mirror/dists/sid/$component/dep11"; - } - if (! -d "$dir/firmware") { mkdir "$dir/firmware" or die "mkdir $dir/firmware failed $!\n"; mkdir "$dir/firmware/dep11" or die "mkdir $dir/firmware/dep11 failed $!\n";