syslinux.bbclass, syslinux: Update to syslinux 6.01

A newer version of syslinux is required for an EFI enabled isohybrid.
This is used for the the capability to generate 3 types of ISO images,
all of which can be booted off a USB device or HDD if copied with dd.

1) PC BIOS only ISO
2) EFI only ISO
3) EFI + PC BIOS ISO

The syslinux.bbclass required a minor tweak because a few .c32
libraries require dynamic loading from the created media as of
syslinux 5 and up.  This was a good time to also fix the
duplication of the AUTO_SYSLINUXMENU block.

[YOCTO #4100]

(From OE-Core rev: 17d74fbd09e377e100423e1a73b9d4ce761a21d7)

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 9 insertions, 12 deletions

diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 49f58f5d08..91b973188c 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -42,28 +42,25 @@ syslinux_populate() {
 
         # Install the config files
         install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME}
+        if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
+                install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${DEST}${BOOTDIR}/vesamenu.c32
+                install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${DEST}${BOOTDIR}/libcom32.c32
+                install -m 0444 ${STAGING_DATADIR}/syslinux/libutil.c32 ${DEST}${BOOTDIR}/libutil.c32
+                if [ "${SYSLINUX_SPLASH}" != "" ] ; then
+                        install -m 0644 ${SYSLINUX_SPLASH} ${DEST}${BOOTDIR}/splash.lss
+                fi
+        fi
 }
 
 syslinux_iso_populate() {
         syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
         install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
-        if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
-                install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32
-                if [ "${SYSLINUX_SPLASH}" != "" ] ; then
-                        install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss
-                fi
-        fi
+        install -m 0644 ${STAGING_DATADIR}/syslinux/ldlinux.c32 ${ISODIR}${ISOLINUXDIR}
 }
 
 syslinux_hddimg_populate() {
         syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
         install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
-        if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
-                install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
-                if [ "${SYSLINUX_SPLASH}" != "" ] ; then
-                        install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss
-                fi
-        fi
 }
 
 syslinux_hddimg_install() {