From: Michael Prokop <mika@grml.org>
Date: Mon, 26 May 2014 10:03:29 +0000 (+0200)
Subject: Further updates for syslinux v3:6.03~pre1+dfsg-4 support
X-Git-Tag: v0.24.0~1
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=7fe3cdb15aca0a8f4412d234964dd2fb4705e9d8

Further updates for syslinux v3:6.03~pre1+dfsg-4 support

We need to also include ldlinux.c32, libcom32.c32 and
libutil.c32, but only for syslinux versions >3:4.05+dfsg-6+deb8u1.

While the modules are located in directory
/usr/lib/syslinux/modules/bios/ the main isolinux.bin file is in
either /usr/lib/ISOLINUX or /usr/lib/syslinux, so adjust code
accordingly.
---

diff --git a/grml-live b/grml-live
index a8116bc..c5c2250 100755
--- a/grml-live
+++ b/grml-live
@@ -892,17 +892,19 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           bailout 8
        fi
 
-       # since syslinux v3:6.03~pre1+dfsg-4 there's a split between
-       # isolinux and syslinux files :(
+       # copy _required_ isolinux files
        if [ -d "${CHROOT_OUTPUT}/usr/lib/ISOLINUX" ] ; then
-         syslinux_dir=/usr/lib/ISOLINUX
-       else
-         syslinux_dir=/usr/lib/syslinux
+         copy_addon_file isolinux.bin /usr/lib/ISOLINUX isolinux
+         copy_addon_file ifcpu64.c32  /usr/lib/syslinux/modules/bios/ isolinux
+         copy_addon_file ldlinux.c32  /usr/lib/syslinux/modules/bios/ isolinux
+         copy_addon_file libcom32.c32 /usr/lib/syslinux/modules/bios/ isolinux
+         copy_addon_file libutil.c32  /usr/lib/syslinux/modules/bios/ isolinux
+         copy_addon_file vesamenu.c32 /usr/lib/syslinux/modules/bios/ isolinux
+       else # syslinux versions <= 3:4.05+dfsg-6+deb8u1
+         copy_addon_file isolinux.bin /usr/lib/syslinux isolinux
+         copy_addon_file ifcpu64.c32  /usr/lib/syslinux isolinux
+         copy_addon_file vesamenu.c32 /usr/lib/syslinux isolinux
        fi
-       # copy _required_ isolinux files
-       for file in ifcpu64.c32 isolinux.bin vesamenu.c32; do
-         copy_addon_file "${file}" "${syslinux_dir}" isolinux
-       done
 
        # *always* copy files to output directory so the variables
        # get adjusted according to the build.