From 8bba3df8659b0f6253b3632be208a7defa6250be Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Fri, 27 Jan 2023 00:37:06 +0100 Subject: [PATCH] make_disc_trees.pl: fix block calculation for --rollback Per-package metadata files ($p.patterns and $p.component) go together, and both needed to be accounted for. --- tools/make_disc_trees.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl index 936ab1ed..3c090c8a 100755 --- a/tools/make_disc_trees.pl +++ b/tools/make_disc_trees.pl @@ -1488,6 +1488,10 @@ sub remove_firmware_stuff { $blocks_removed += get_file_blocks("$dir/firmware/dep11/$p.patterns"); msg_ap(0, "Remove $dir/firmware/dep11/$p.patterns\n"); unlink("$dir/firmware/dep11/$p.patterns"); + + $blocks_removed += get_file_blocks("$dir/firmware/dep11/$p.component"); + msg_ap(0, "Remove $dir/firmware/dep11/$p.component\n"); + unlink("$dir/firmware/dep11/$p.component"); } # Find the current size of the firmware Contents file, and grep