Skip to content

Commit

Permalink
Don't consume stderr in merge-squashfs
Browse files Browse the repository at this point in the history
Part of nerves-project/nerves#877 for adding more useful output during the firmware build process.

nerves-project/nerves#876 shows cases where `mix firmware` fails to build. In reproducing, I found that `merge-squashfs` was failing silently. Specifically at this line because `2>/dev/null` was forwarding stderr to be ignored.

Instead, this changes to let stderr through so more helpful messages can be reviewed
  • Loading branch information
jjcarstens committed Jun 27, 2023
1 parent e302e64 commit ded9467
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/merge-squashfs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ find_to_pseudofile "$overlay_dir" >>pseudofile.in
# remove repeated entries to avoid warnings from mksquashfs
awk '!x[$1]++' pseudofile.in > pseudofile

unsquashfs "$input_squashfs" >/dev/null 2>/dev/null
unsquashfs "$input_squashfs" >/dev/null
cp -Rf "$overlay_dir/." "$workdir/squashfs-root"
mksquashfs squashfs-root "$output_squashfs" -pf pseudofile -sort "$squashfs_priorities" -noappend -no-recovery -no-progress $NERVES_MKSQUASHFS_FLAGS

Expand Down

0 comments on commit ded9467

Please sign in to comment.