Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7980f029 authored by Changbin Du's avatar Changbin Du Committed by Ingo Molnar
Browse files

x86/build: Make the boot image generation less verbose 



This change suppresses the 'dd' output and adds the '-quiet' parameter
to mkisofs tool. It also removes the 'Using ...' messages, as none of the
messages matter to the user normally.

"make V=1" can still be used for a more verbose build.

The new build messages are now a streamlined set of:

  $ make isoimage
  ...
  Kernel: arch/x86/boot/bzImage is ready  (#75)
    GENIMAGE arch/x86/boot/image.iso
  Kernel: arch/x86/boot/image.iso is ready

Signed-off-by: default avatarChangbin Du <changbin.du@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1510207751-22166-1-git-send-email-changbin.du@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a9e017d5

arch/x86/boot/genimage.sh

+10 −5
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ 
#   $6 - inird image file

#



# Use "make V=1" to debug this script

case "${KBUILD_VERBOSE}" in

*1*)

        set -x

        ;;

esac



verify () {

	if [ ! -f "$1" ]; then

		echo ""                                                   1>&2
@@ -50,7 +57,7 @@ genbzdisk() { 
}



genfdimage144() {

	dd if=/dev/zero of=$FIMAGE bs=1024 count=1440

	dd if=/dev/zero of=$FIMAGE bs=1024 count=1440 2> /dev/null

	mformat v:

	syslinux $FIMAGE

	echo "$KCMDLINE" | mcopy - v:syslinux.cfg
@@ -61,7 +68,7 @@ genfdimage144() { 
}



genfdimage288() {

	dd if=/dev/zero of=$FIMAGE bs=1024 count=2880

	dd if=/dev/zero of=$FIMAGE bs=1024 count=2880 2> /dev/null

	mformat w:

	syslinux $FIMAGE

	echo "$KCMDLINE" | mcopy - W:syslinux.cfg
@@ -79,14 +86,12 @@ genisoimage() { 
		for j in syslinux ISOLINUX ; do

			if [ -f /usr/$i/$j/isolinux.bin ] ; then

				isolinux=/usr/$i/$j/isolinux.bin

				echo "Using $isolinux"

				cp $isolinux $tmp_dir

			fi

		done

		for j in syslinux syslinux/modules/bios ; do

			if [ -f /usr/$i/$j/ldlinux.c32 ]; then

				ldlinux=/usr/$i/$j/ldlinux.c32

				echo "Using $ldlinux"

				cp $ldlinux $tmp_dir

			fi

		done
@@ -103,7 +108,7 @@ genisoimage() { 
	if [ -f "$FDINITRD" ] ; then

		cp "$FDINITRD" $tmp_dir/initrd.img

	fi

	mkisofs -J -r -input-charset=utf-8 -o $FIMAGE -b isolinux.bin \

	mkisofs -J -r -input-charset=utf-8 -quiet -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