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

Commit 8a7546a0 authored by Changbin Du's avatar Changbin Du Committed by Ingo Molnar
Browse files

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: 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>
Cc: yamada.masahiro@socionext.com
Link: http://lkml.kernel.org/r/1509939179-7556-3-git-send-email-changbin.du@intel.com


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

arch/x86/boot/genimage.sh

+18 −5
Original line number Diff line number Diff line
@@ -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