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

make-firmware-image: fix missing Contents-firmware index (Closes: #1031598)

This commit is contained in:
Cyril Brulebois 2023-02-19 03:42:36 +01:00
parent aebf4f0556
commit 7eea34f26f
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/make-firmware-image
View File

@ -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

1
tools/make_disc_trees.pl
View File

@ -1275,6 +1275,7 @@ sub add_firmware_stuff {
or die "Can't find contents of $dir/firmware/$base_file: $!";
while (defined(my $line = <DPKGC>)) {
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;
}