From 7eea34f26fd61035e443d67bff8f08e5e66196df Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 19 Feb 2023 03:42:36 +0100 Subject: [PATCH] make-firmware-image: fix missing Contents-firmware index (Closes: #1031598) --- tools/make-firmware-image | 6 ++++++ tools/make_disc_trees.pl | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/make-firmware-image b/tools/make-firmware-image index 4da728ba..080b5437 100755 --- a/tools/make-firmware-image +++ b/tools/make-firmware-image @@ -68,6 +68,12 @@ $BASEDIR/tools/generate_firmware_task '*' --list-filenames-and-indices | sort -u if [ -f $FW_DEP11_DIR/$PACKAGE.patterns ]; then printf "%s\n" $COMPONENT > $FW_DEP11_DIR/$PACKAGE.component fi + + # XXX: Keep in line with make_disc_trees.pl! + BASEFILE=$(basename $FILE) + dpkg --contents ${MIRROR}/$FILE | \ + perl -ne 'printf "%-55s %s %s\n", "/$1", "'$BASEFILE'", "'$COMPONENT'" + if m,^[-|l]\S+\s+\S+\s+\d+\s+\S+\s+\S+\s+./(\S+/firmware/\S+),' >> $TMPDIR/firmware/Contents-firmware done cd $TMPDIR/firmware diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl index fd345d38..204c6193 100755 --- a/tools/make_disc_trees.pl +++ b/tools/make_disc_trees.pl @@ -1275,6 +1275,7 @@ sub add_firmware_stuff { or die "Can't find contents of $dir/firmware/$base_file: $!"; while (defined(my $line = )) { chomp $line; + # XXX: Keep in line with make-firmware-image! if ($line =~ m,^[-|l]\S+\s+\S+\s+\d+\s+\S+\s+\S+\s+./(\S+/firmware/\S+),) { printf OFILE "%-55s %s %s\n", "/$1", $base_file, $component; }