lkml.org 
[lkml]   [2017]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/asm] x86/build: Add new paths for isolinux.bin and ldlinux.c32
    Commit-ID:  8a7546a04ecb7c9388a3e935c6cfcc7c2c4c6b67
    Gitweb: https://git.kernel.org/tip/8a7546a04ecb7c9388a3e935c6cfcc7c2c4c6b67
    Author: Changbin Du <changbin.du@intel.com>
    AuthorDate: Mon, 6 Nov 2017 11:32:57 +0800
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 7 Nov 2017 11:22:20 +0100

    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>
    ---
    arch/x86/boot/genimage.sh | 23 ++++++++++++++++++-----
    1 file changed, 18 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/boot/genimage.sh b/arch/x86/boot/genimage.sh
    index 75a9de1..6c8100b 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
    \
     
     \ /
      Last update: 2017-11-08 21:03    [W:4.897 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site