Skip to contentSkip to conversation

x86/build: Don't verify mtools configuration file for isoimage

PATCH New [email protected] 2 participants 2 messages Nov 30, 2017 – Dec 12, 2017 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/build: Don't verify mtools configuration file for isoimage

From: Changbin Du <[email protected]>

If mtools.conf is not generated before, 'make isoimage' could complain:

Kernel: arch/x86/boot/bzImage is ready (#597)
GENIMAGE arch/x86/boot/image.iso
*** Missing file: arch/x86/boot/mtools.conf
arch/x86/boot/Makefile:144: recipe for target 'isoimage' failed

mtools.conf is not used for isoimage generation, so do not check it.

Fixes 4366d57af1 ("x86/build: Factor out fdimage/isoimage generation commands to standalone script")
---
 arch/x86/boot/genimage.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/boot/genimage.sh +3 -1
index 49f4970..c9e8499 100644
@@ -44,9 +44,9 @@ FDINITRD=$6
 
 # Make sure the files actually exist
 verify "$FBZIMAGE"
-verify "$MTOOLSRC"
 
 genbzdisk() {
+	verify "$MTOOLSRC"
 	mformat a:
 	syslinux $FIMAGE
 	echo "$KCMDLINE" | mcopy - a:syslinux.cfg
@@ -57,6 +57,7 @@ genbzdisk() {
 }
 
 genfdimage144() {
+	verify "$MTOOLSRC"
 	dd if=/dev/zero of=$FIMAGE bs=1024 count=1440 2> /dev/null
 	mformat v:
 	syslinux $FIMAGE
@@ -68,6 +69,7 @@ genfdimage144() {
 }
 
 genfdimage288() {
+	verify "$MTOOLSRC"
 	dd if=/dev/zero of=$FIMAGE bs=1024 count=2880 2> /dev/null
 	mformat w:
 	syslinux $FIMAGE
Signature · 1 line
2.7.4
#1 lore raw
x86/build: Don't verify mtools configuration file for isoimage
Commit-ID:  f79ce87fa49da778a1ad54c7d3c6755e13cf8489
Gitweb:     https://git.kernel.org/tip/f79ce87fa49da778a1ad54c7d3c6755e13cf8489
Author:     Changbin Du <[email protected]>
AuthorDate: Thu, 30 Nov 2017 22:51:20 +0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 11 Dec 2017 18:55:38 +0100

x86/build: Don't verify mtools configuration file for isoimage

If mtools.conf is not generated before, 'make isoimage' could complain:

Kernel: arch/x86/boot/bzImage is ready (#597)
GENIMAGE arch/x86/boot/image.iso
*** Missing file: arch/x86/boot/mtools.conf
arch/x86/boot/Makefile:144: recipe for target 'isoimage' failed

mtools.conf is not used for isoimage generation, so do not check it.

Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Fixes 4366d57af1 ("x86/build: Factor out fdimage/isoimage generation commands to standalone script")
---
 arch/x86/boot/genimage.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/boot/genimage.sh +3 -1
index 49f4970..c9e8499 100644
@@ -44,9 +44,9 @@ FDINITRD=$6
 
 # Make sure the files actually exist
 verify "$FBZIMAGE"
-verify "$MTOOLSRC"
 
 genbzdisk() {
+	verify "$MTOOLSRC"
 	mformat a:
 	syslinux $FIMAGE
 	echo "$KCMDLINE" | mcopy - a:syslinux.cfg
@@ -57,6 +57,7 @@ genbzdisk() {
 }
 
 genfdimage144() {
+	verify "$MTOOLSRC"
 	dd if=/dev/zero of=$FIMAGE bs=1024 count=1440 2> /dev/null
 	mformat v:
 	syslinux $FIMAGE
@@ -68,6 +69,7 @@ genfdimage144() {
 }
 
 genfdimage288() {
+	verify "$MTOOLSRC"
 	dd if=/dev/zero of=$FIMAGE bs=1024 count=2880 2> /dev/null
 	mformat w:
 	syslinux $FIMAGE