From 5e39a81adbb69878e7aa12bae5f9d1d4469e50e8 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Fri, 27 Jan 2023 00:37:06 +0100
Subject: [PATCH] make_disc_trees.pl: fix block calculation for multi-arch

Per-package metadata files ($p.patterns and $p.component) go together,
and both needed to be accounted for.
---
 tools/make_disc_trees.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index f1adf9e4..936ab1ed 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -1229,6 +1229,7 @@ sub add_firmware_stuff {
     # (e.g. multi-arch), in which case we'll replace it here
     if (-f "$dir/firmware/dep11/$p.patterns") {
 	$blocks_added -= get_file_blocks("$dir/firmware/dep11/$p.patterns");
+	$blocks_added -= get_file_blocks("$dir/firmware/dep11/$p.component");
     }
 
     msg_ap(0, "(Maybe) generate fw pattern file $dir/firmware/dep11/$p.patterns\n");