summaryrefslogtreecommitdiffstats
path: root/meta/classes/syslinux.bbclass
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-02-01 16:15:04 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-08 00:50:22 +0000
commit67cfa7474449987f1f0c5232e19783ee79e3883d (patch)
treecaa97626a856ea434a469c37e340d2ddc4b7499d /meta/classes/syslinux.bbclass
parent50a097be169f4eb0bfbef181c11bd4afe8ad127b (diff)
downloadpoky-67cfa7474449987f1f0c5232e19783ee79e3883d.tar.gz
bootimg: Use the same OS files for each boot method
Fixes [YOCTO #1951] The do_bootimg code can generate hybrid efi+pcbios images (syslinux and grub-efi) to boot on platforms with both EFI and legacy BIOS options. The current implementation copies the kernel, initrd, and rootfs twice, unnecessarily bloating the image size. This is an especially egregious bug on -sato images. Update the classes to use a common install of the kernel, initrd, and rootfs to the root of the boot media. Grub-efi, syslinux, and isolinux can all reference this location explicitly with a leading slash. Tested with an EFI+PCBIOS image in both EFI and PCBIOS boot modes on two platforms. No ISO image testing was performed. (From OE-Core rev: 5209016cf4c4c8f649e37dc8857b3fbcfe8dd8c8) Signed-off-by: Darren Hart <dvhart@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.bbclass34
1 files changed, 13 insertions, 21 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 91c4275747..1569074b21 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -18,42 +18,34 @@ do_bootimg[depends] += "syslinux:do_populate_sysroot \
18SYSLINUXCFG = "${S}/syslinux.cfg" 18SYSLINUXCFG = "${S}/syslinux.cfg"
19SYSLINUXMENU = "${S}/menu" 19SYSLINUXMENU = "${S}/menu"
20 20
21SYSLINUX_ISODIR = "${ISODIR}/isolinux" 21ISOLINUXDIR = "/isolinux"
22SYSLINUX_HDDDIR = "${HDDDIR}" 22SYSLINUXDIR = "/"
23ISO_BOOTIMG = "isolinux/isolinux.bin" 23ISO_BOOTIMG = "isolinux/isolinux.bin"
24ISO_BOOTCAT = "isolinux/boot.cat" 24ISO_BOOTCAT = "isolinux/boot.cat"
25MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table" 25MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
26 26
27syslinux_populate() { 27syslinux_populate() {
28 DEST=$1 28 DEST=$1
29 CFGNAME=$2 29 BOOTDIR=$2
30 CFGNAME=$3
30 31
31 install -d ${DEST} 32 install -d ${DEST}${BOOTDIR}
32
33 # Install the kernel, initrd, and rootfs
34 install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
35 if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
36 install -m 0644 ${INITRD} ${DEST}/initrd
37 fi
38 if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then
39 install -m 0644 ${ROOTFS} ${DEST}/rootfs.img
40 fi
41 33
42 # Install the config files 34 # Install the config files
43 install -m 0644 ${SYSLINUXCFG} ${DEST}/${CFGNAME} 35 install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME}
44 if [ -f ${SYSLINUXMENU} ]; then 36 if [ -f ${SYSLINUXMENU} ]; then
45 install -m 0644 ${SYSLINUXMENU} ${DEST} 37 install -m 0644 ${SYSLINUXMENU} ${DEST}${BOOTDIR}
46 fi 38 fi
47} 39}
48 40
49syslinux_iso_populate() { 41syslinux_iso_populate() {
50 syslinux_populate ${SYSLINUX_ISODIR} isolinux.cfg 42 syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
51 install -m 0644 ${STAGING_LIBDIR}/syslinux/isolinux.bin ${SYSLINUX_ISODIR} 43 install -m 0644 ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
52} 44}
53 45
54syslinux_hddimg_populate() { 46syslinux_hddimg_populate() {
55 syslinux_populate ${SYSLINUX_HDDDIR} syslinux.cfg 47 syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
56 install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${SYSLINUX_HDDDIR}/ldlinux.sys 48 install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
57} 49}
58 50
59syslinux_hddimg_install() { 51syslinux_hddimg_install() {
@@ -187,7 +179,7 @@ python build_syslinux_cfg () {
187 localdata.setVar('OVERRIDES', label + ':' + overrides) 179 localdata.setVar('OVERRIDES', label + ':' + overrides)
188 bb.data.update_data(localdata) 180 bb.data.update_data(localdata)
189 181
190 cfgfile.write('LABEL %s\nKERNEL vmlinuz\n' % (label)) 182 cfgfile.write('LABEL %s\nKERNEL /vmlinuz\n' % (label))
191 183
192 append = localdata.getVar('APPEND', 1) 184 append = localdata.getVar('APPEND', 1)
193 initrd = localdata.getVar('INITRD', 1) 185 initrd = localdata.getVar('INITRD', 1)
@@ -196,7 +188,7 @@ python build_syslinux_cfg () {
196 cfgfile.write('APPEND ') 188 cfgfile.write('APPEND ')
197 189
198 if initrd: 190 if initrd:
199 cfgfile.write('initrd=initrd ') 191 cfgfile.write('initrd=/initrd ')
200 192
201 cfgfile.write('LABEL=%s '% (label)) 193 cfgfile.write('LABEL=%s '% (label))
202 194