summaryrefslogtreecommitdiffstats
path: root/meta/classes/bootimg.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/bootimg.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/bootimg.bbclass')
-rw-r--r--meta/classes/bootimg.bbclass31
1 files changed, 24 insertions, 7 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index a717600cf9..1d1a3d04af 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -8,13 +8,13 @@
8# End result is two things: 8# End result is two things:
9# 9#
10# 1. A .hddimg file which is an msdos filesystem containing syslinux, a kernel, 10# 1. A .hddimg file which is an msdos filesystem containing syslinux, a kernel,
11# an initrd and a rootfs image. These can be written to harddisks directly and 11# an initrd and a rootfs image. These can be written to harddisks directly and
12# also booted on USB flash disks (write them there with dd). 12# also booted on USB flash disks (write them there with dd).
13# 13#
14# 2. A CD .iso image 14# 2. A CD .iso image
15 15
16# Boot process is that the initrd will boot and process which label was selected 16# Boot process is that the initrd will boot and process which label was selected
17# in syslinux. Actions based on the label are then performed (e.g. installing to 17# in syslinux. Actions based on the label are then performed (e.g. installing to
18# an hdd) 18# an hdd)
19 19
20# External variables (also used by syslinux.bbclass) 20# External variables (also used by syslinux.bbclass)
@@ -29,8 +29,8 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
29PACKAGES = " " 29PACKAGES = " "
30EXCLUDE_FROM_WORLD = "1" 30EXCLUDE_FROM_WORLD = "1"
31 31
32HDDDIR = "${S}/hdd/boot" 32HDDDIR = "${S}/hddimg"
33ISODIR = "${S}/cd" 33ISODIR = "${S}/iso"
34 34
35BOOTIMG_VOLUME_ID ?= "boot" 35BOOTIMG_VOLUME_ID ?= "boot"
36BOOTIMG_EXTRA_SPACE ?= "512" 36BOOTIMG_EXTRA_SPACE ?= "512"
@@ -58,6 +58,22 @@ PCBIOS_CLASS = ${@pcbios_class(d)}
58inherit ${PCBIOS_CLASS} 58inherit ${PCBIOS_CLASS}
59inherit ${EFI_CLASS} 59inherit ${EFI_CLASS}
60 60
61populate() {
62 DEST=$1
63 install -d ${DEST}
64
65 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
66 install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
67
68 if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
69 install -m 0644 ${INITRD} ${DEST}/initrd
70 fi
71
72 if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then
73 install -m 0644 ${ROOTFS} ${DEST}/rootfs.img
74 fi
75
76}
61 77
62build_iso() { 78build_iso() {
63 # Only create an ISO if we have an INITRD and NOISO was not set 79 # Only create an ISO if we have an INITRD and NOISO was not set
@@ -66,7 +82,7 @@ build_iso() {
66 return 82 return
67 fi 83 fi
68 84
69 install -d ${ISODIR} 85 populate ${ISODIR}
70 86
71 if [ "${PCBIOS}" = "1" ]; then 87 if [ "${PCBIOS}" = "1" ]; then
72 syslinux_iso_populate 88 syslinux_iso_populate
@@ -95,7 +111,8 @@ build_iso() {
95build_hddimg() { 111build_hddimg() {
96 # Create an HDD image 112 # Create an HDD image
97 if [ "${NOHDD}" != "1" ] ; then 113 if [ "${NOHDD}" != "1" ] ; then
98 install -d ${HDDDIR} 114 populate ${HDDDIR}
115
99 if [ "${PCBIOS}" = "1" ]; then 116 if [ "${PCBIOS}" = "1" ]; then
100 syslinux_hddimg_populate 117 syslinux_hddimg_populate
101 fi 118 fi