lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Thu, 9 Nov 2017 02:16:17 -0800
From:   tip-bot for Changbin Du <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     tglx@...utronix.de, linux-kernel@...r.kernel.org,
        changbin.du@...el.com, mingo@...nel.org, peterz@...radead.org,
        hpa@...or.com, torvalds@...ux-foundation.org
Subject: [tip:x86/asm] x86/build: Make the boot image generation less
 verbose

Commit-ID:  7980f029d05d8a3b4634aa6952e1ec51bce9431f
Gitweb:     https://git.kernel.org/tip/7980f029d05d8a3b4634aa6952e1ec51bce9431f
Author:     Changbin Du <changbin.du@...el.com>
AuthorDate: Thu, 9 Nov 2017 14:09:11 +0800
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 9 Nov 2017 07:34:57 +0100

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: Changbin Du <changbin.du@...el.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1510207751-22166-1-git-send-email-changbin.du@intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/boot/genimage.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh
index 628e936..49f4970 100644
--- a/arch/x86/boot/genimage.sh
+++ b/arch/x86/boot/genimage.sh
@@ -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

Powered by blists - more mailing lists