summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/classes/syslinux.bbclass21
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_6.01.bb (renamed from meta/recipes-devtools/syslinux/syslinux_4.07.bb)26
2 files changed, 25 insertions, 22 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() {
diff --git a/meta/recipes-devtools/syslinux/syslinux_4.07.bb b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
index bba5dda584..4438ea8330 100644
--- a/meta/recipes-devtools/syslinux/syslinux_4.07.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
@@ -2,19 +2,21 @@ DESCRIPTION = "A multi-purpose linux bootloader"
2HOMEPAGE = "http://syslinux.zytor.com/" 2HOMEPAGE = "http://syslinux.zytor.com/"
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
5 file://README;beginline=35;endline=41;md5=f7249a750bc692d1048b2626752aa415" 5 file://README;beginline=35;endline=41;md5=558f2c71cb1fb9ba511ccd4858e48e8a"
6 6
7# If you really want to run syslinux, you need mtools. We just want the 7# If you really want to run syslinux, you need mtools. We just want the
8# ldlinux.* stuff for now, so skip mtools-native 8# ldlinux.* stuff for now, so skip mtools-native
9DEPENDS = "nasm-native util-linux" 9DEPENDS = "nasm-native util-linux"
10PR = "r0"
11 10
12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2" 11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar.bz2"
13 12
14SRC_URI[md5sum] = "9ff6e1b94efab931fb4717b600d88779" 13SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534"
15SRC_URI[sha256sum] = "1240a4e4219b518bdaef78931b6e901befeff35e6894ac6db785115848a7a05a" 14SRC_URI[sha256sum] = "83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43"
16 15
17COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' 16COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
17# Don't let the sanity checker trip on the 32 bit real mode BIOS binaries
18INSANE_SKIP_${PN}-misc = "arch"
19INSANE_SKIP_${PN}-chain = "arch"
18 20
19EXTRA_OEMAKE = " \ 21EXTRA_OEMAKE = " \
20 BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \ 22 BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \
@@ -28,21 +30,25 @@ do_configure() {
28 sed -e 's,win32/\S*,,g' -i Makefile 30 sed -e 's,win32/\S*,,g' -i Makefile
29 31
30 # clean installer executables included in source tarball 32 # clean installer executables included in source tarball
31 oe_runmake clean 33 oe_runmake clean firmware="efi32" EFIINC="${includedir}"
34 # NOTE: There is a temporary work around above to specify
35 # the efi32 as the firmware else the pre-built bios
36 # files get erased contrary to the doc/distib.txt
37 # In the future this should be "bios" and not "efi32".
32} 38}
33 39
34do_compile() { 40do_compile() {
35 # Rebuild only the installer; keep precompiled bootloaders 41 # Rebuild only the installer; keep precompiled bootloaders
36 # as per author's request (doc/distrib.txt) 42 # as per author's request (doc/distrib.txt)
37 oe_runmake CC="${CC} ${CFLAGS}" LDFLAGS="${LDFLAGS}" installer 43 oe_runmake CC="${CC} ${CFLAGS}" LDFLAGS="${LDFLAGS}" firmware="bios" installer
38} 44}
39 45
40do_install() { 46do_install() {
41 oe_runmake install INSTALLROOT="${D}" 47 oe_runmake install INSTALLROOT="${D}" firmware="bios"
42 48
43 install -d ${D}${datadir}/syslinux/ 49 install -d ${D}${datadir}/syslinux/
44 install -m 644 ${S}/core/ldlinux.sys ${D}${datadir}/syslinux/ 50 install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/
45 install -m 644 ${S}/core/ldlinux.bss ${D}${datadir}/syslinux/ 51 install -m 644 ${S}/bios/core/ldlinux.bss ${D}${datadir}/syslinux/
46} 52}
47 53
48PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc" 54PACKAGES += "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux ${PN}-misc"