Commit-ID:  c306ba7b909408dbf935bb4a8dc62fae64cb337c
Gitweb:     https://git.kernel.org/tip/c306ba7b909408dbf935bb4a8dc62fae64cb337c
Author:     Changbin Du <changbin...@intel.com>
AuthorDate: Mon, 6 Nov 2017 11:32:58 +0800
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Tue, 7 Nov 2017 11:22:20 +0100

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...@intel.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: yamada.masah...@socionext.com
Link: 
http://lkml.kernel.org/r/1509939179-7556-4-git-send-email-changbin...@intel.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/x86/boot/genimage.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh
index 6c8100b..628e936 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
 }

Reply via email to