summaryrefslogtreecommitdiff
path: root/arch/x86/boot/genimage.sh
diff options
context:
space:
mode:
authorChangbin Du <changbin.du@intel.com>2017-11-06 06:32:57 +0300
committerIngo Molnar <mingo@kernel.org>2017-11-07 13:22:20 +0300
commit8a7546a04ecb7c9388a3e935c6cfcc7c2c4c6b67 (patch)
treef31e20684ef6b584e9416528479cfc8f184cf319 /arch/x86/boot/genimage.sh
parent4366d57af19e89d23ef9154414b2539f1c3d18fa (diff)
downloadlinux-8a7546a04ecb7c9388a3e935c6cfcc7c2c4c6b67.tar.xz
x86/build: Add new paths for isolinux.bin and ldlinux.c32
Recently I failed to build isoimage target, because the path of isolinux.bin changed to /usr/xxx/ISOLINUX/isolinux.bin, as well as ldlinux.c32 which changed to /usr/xxx/syslinux/modules/bios/ldlinux.c32. This patch improves the file search logic: - Show a error message instead of silent fail. - Add above new paths. 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-3-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.sh23
1 files changed, 18 insertions, 5 deletions
diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh
index 75a9de1d3f72..6c8100b51ea9 100644
--- a/arch/x86/boot/genimage.sh
+++ b/arch/x86/boot/genimage.sh
@@ -76,14 +76,27 @@ genisoimage() {
rm -rf $tmp_dir
mkdir $tmp_dir
for i in lib lib64 share end ; do
- if [ -f /usr/$i/syslinux/isolinux.bin ] ; then
- cp /usr/$i/syslinux/isolinux.bin $tmp_dir
- if [ -f /usr/$i/syslinux/ldlinux.c32 ]; then
- cp /usr/$i/syslinux/ldlinux.c32 $tmp_dir
+ 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
+ if [ -n "$isolinux" -a -n "$ldlinux" ] ; then
break
fi
- if [ $i = end ] ; then exit 1 ; fi ;
+ if [ $i = end -a -z "$isolinux" ] ; then
+ echo 'Need an isolinux.bin file, please install syslinux/isolinux.'
+ exit 1
+ fi
done
cp $FBZIMAGE $tmp_dir/linux
echo "$KCMDLINE" > $tmp_dir/isolinux.cfg