diff options
author | Changbin Du <changbin.du@intel.com> | 2017-11-06 04:32:58 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 11:22:20 +0100 |
commit | c306ba7b909408dbf935bb4a8dc62fae64cb337c (patch) | |
tree | 26d33fb015951d912f71411f23b4295ed632c8cb /arch/x86/boot/genimage.sh | |
parent | x86/build: Add new paths for isolinux.bin and ldlinux.c32 (diff) | |
download | linux-c306ba7b909408dbf935bb4a8dc62fae64cb337c.tar.xz linux-c306ba7b909408dbf935bb4a8dc62fae64cb337c.zip |
x86/build: Specify -input-charset=utf-8 for mkisofs
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 <changbin.du@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: yamada.masahiro@socionext.com
Link: http://lkml.kernel.org/r/1509939179-7556-4-git-send-email-changbin.du@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/genimage.sh')
-rw-r--r-- | arch/x86/boot/genimage.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh index 6c8100b51ea9..628e93662093 100644 --- a/arch/x86/boot/genimage.sh +++ b/arch/x86/boot/genimage.sh @@ -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 } |