Skip to content

Commit

Permalink
x86/build: Specify -input-charset=utf-8 for mkisofs
Browse files Browse the repository at this point in the history
It avoids the following warning triggered by newer versions of mkisofs:

    -input-charset not specified, using utf-8 (detected in locale settings)

Signed-off-by: Changbin Du <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
Changbin Du authored and Ingo Molnar committed Nov 7, 2017
1 parent 8a7546a commit c306ba7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/x86/boot/genimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ genisoimage() {
if [ -f "$FDINITRD" ] ; then
cp "$FDINITRD" $tmp_dir/initrd.img
fi
mkisofs -J -r -o $FIMAGE -b isolinux.bin -c boot.cat \
-no-emul-boot -boot-load-size 4 -boot-info-table $tmp_dir
mkisofs -J -r -input-charset=utf-8 -o $FIMAGE -b isolinux.bin \
-c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
$tmp_dir
isohybrid $FIMAGE 2>/dev/null || true
rm -rf $tmp_dir
}
Expand Down

0 comments on commit c306ba7

Please sign in to comment.