summaryrefslogtreecommitdiffstats
path: root/meta/classes/syslinux.bbclass
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2013-09-17 13:32:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:11:56 +0100
commitec9f4c3c25544e7613058113f283658ce604c937 (patch)
tree9819fea83603b342cbeb9230cc6e6983b8a8992e /meta/classes/syslinux.bbclass
parentfde291198386dae7eca868276d5e1a7b069fda58 (diff)
downloadpoky-ec9f4c3c25544e7613058113f283658ce604c937.tar.gz
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>
Diffstat (limited to 'meta/classes/syslinux.bbclass')
-rw-r--r--meta/classes/syslinux.bbclass21
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() {
42 42
43 # Install the config files 43 # Install the config files
44 install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME} 44 install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME}
45 if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
46 install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${DEST}${BOOTDIR}/vesamenu.c32
47 install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${DEST}${BOOTDIR}/libcom32.c32
48 install -m 0444 ${STAGING_DATADIR}/syslinux/libutil.c32 ${DEST}${BOOTDIR}/libutil.c32
49 if [ "${SYSLINUX_SPLASH}" != "" ] ; then
50 install -m 0644 ${SYSLINUX_SPLASH} ${DEST}${BOOTDIR}/splash.lss
51 fi
52 fi
45} 53}
46 54
47syslinux_iso_populate() { 55syslinux_iso_populate() {
48 syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg 56 syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
49 install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} 57 install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
50 if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then 58 install -m 0644 ${STAGING_DATADIR}/syslinux/ldlinux.c32 ${ISODIR}${ISOLINUXDIR}
51 install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32
52 if [ "${SYSLINUX_SPLASH}" != "" ] ; then
53 install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss
54 fi
55 fi
56} 59}
57 60
58syslinux_hddimg_populate() { 61syslinux_hddimg_populate() {
59 syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg 62 syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
60 install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys 63 install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
61 if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
62 install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
63 if [ "${SYSLINUX_SPLASH}" != "" ] ; then
64 install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss
65 fi
66 fi
67} 64}
68 65
69syslinux_hddimg_install() { 66syslinux_hddimg_install() {