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

Tweak firmware-image build scripts 

Add more debug to generate_firmware_patterns when called with -v
Make make-firmware-image more robust, I hope?
This commit is contained in:
Steve McIntyre 2023-02-09 17:44:28 +00:00
parent 80f7fa39ff
commit ecb6ec4a0a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/generate_firmware_patterns
View File

@ -158,6 +158,9 @@ sub generate_patterns_for_firmware_sof_intel_workaround {
} }
print STDERR "Looking up patterns for package $pkgname\n"
if $verbose;
# Make sure the output directory exists: # Make sure the output directory exists:
die "missing output directory $output_dir" die "missing output directory $output_dir"
if ! -d $output_dir; if ! -d $output_dir;
@ -175,3 +178,6 @@ foreach my $components (@ARGV) {
# Only apply the workaround when relevant: # Only apply the workaround when relevant:
generate_patterns_for_firmware_sof_intel_workaround() generate_patterns_for_firmware_sof_intel_workaround()
if ! $done and $pkgname eq $SOF; if ! $done and $pkgname eq $SOF;
print STDERR "Done with package $pkgname\n"
if $verbose;

8
tools/make-firmware-image
View File

@ -62,8 +62,12 @@ $BASEDIR/tools/generate_firmware_task '*' --list-filenames-and-indices | sort -u
# Mimic make_disc_trees.pl, except it only passes a single Components-<arch>.yml.gz while # Mimic make_disc_trees.pl, except it only passes a single Components-<arch>.yml.gz while
# we pass all of them. Differences are unlikely though, as interesting firmware packages # we pass all of them. Differences are unlikely though, as interesting firmware packages
# are "Architecture: all". # are "Architecture: all".
$BASEDIR/tools/generate_firmware_patterns --output-dir $FW_DEP11_DIR --package $PACKAGE $DEP11_DIR/Components-*.yml.gz $BASEDIR/tools/generate_firmware_patterns \
[ -f $FW_DEP11_DIR/$PACKAGE.patterns ] && printf $COMPONENT > $FW_DEP11_DIR/$PACKAGE.component -v --output-dir $FW_DEP11_DIR \
--package $PACKAGE $DEP11_DIR/Components-*.yml.gz
if [ -f $FW_DEP11_DIR/$PACKAGE.patterns ]; then
printf "%s\n" $COMPONENT > $FW_DEP11_DIR/$PACKAGE.component
fi
done done
cd $TMPDIR/firmware cd $TMPDIR/firmware