summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/boot-directdisk.bbclass1
-rw-r--r--meta/classes/bootimg.bbclass9
-rw-r--r--meta/classes/image-live.bbclass1
-rw-r--r--meta/classes/syslinux.bbclass7
4 files changed, 10 insertions, 8 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index c6ada47479..46f88ac9bf 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -59,7 +59,6 @@ inherit ${EFI_CLASS}
59 59
60DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" 60DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
61ROOT_VM ?= "root=/dev/sda2" 61ROOT_VM ?= "root=/dev/sda2"
62SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg"
63 62
64boot_direct_populate() { 63boot_direct_populate() {
65 dest=$1 64 dest=$1
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 70ce07032b..d9ed7dbbdb 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -40,6 +40,11 @@ EFIIMGDIR = "${S}/efi_img"
40COMPACT_ISODIR = "${S}/iso.z" 40COMPACT_ISODIR = "${S}/iso.z"
41COMPRESSISO ?= "0" 41COMPRESSISO ?= "0"
42 42
43ISOLINUXDIR ?= "/isolinux"
44ISO_BOOTIMG = "isolinux/isolinux.bin"
45ISO_BOOTCAT = "isolinux/boot.cat"
46MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
47
43BOOTIMG_VOLUME_ID ?= "boot" 48BOOTIMG_VOLUME_ID ?= "boot"
44BOOTIMG_EXTRA_SPACE ?= "512" 49BOOTIMG_EXTRA_SPACE ?= "512"
45 50
@@ -59,10 +64,10 @@ def pcbios(d):
59 return pcbios 64 return pcbios
60 65
61PCBIOS = "${@pcbios(d)}" 66PCBIOS = "${@pcbios(d)}"
67PCBIOS_CLASS = "${@['','syslinux'][d.getVar('PCBIOS', True) == '1']}"
62 68
63# The syslinux is required for the isohybrid command and boot catalog
64inherit syslinux
65inherit ${EFI_CLASS} 69inherit ${EFI_CLASS}
70inherit ${PCBIOS_CLASS}
66 71
67populate() { 72populate() {
68 DEST=$1 73 DEST=$1
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 504725d266..05e416abe0 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -3,7 +3,6 @@ INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
3INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz" 3INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
4ROOT_LIVE ?= "root=/dev/ram0" 4ROOT_LIVE ?= "root=/dev/ram0"
5LABELS_LIVE ?= "boot install" 5LABELS_LIVE ?= "boot install"
6SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
7 6
8ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 7ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
9 8
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 6de656bc13..7d324c31de 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -20,7 +20,7 @@
20do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \ 20do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \
21 syslinux-native:do_populate_sysroot" 21 syslinux-native:do_populate_sysroot"
22 22
23ISOLINUXDIR = "/isolinux" 23ISOLINUXDIR ?= "/isolinux"
24SYSLINUXDIR = "/" 24SYSLINUXDIR = "/"
25# The kernel has an internal default console, which you can override with 25# The kernel has an internal default console, which you can override with
26# a console=...some_tty... 26# a console=...some_tty...
@@ -30,10 +30,9 @@ SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200"
30SYSLINUX_PROMPT ?= "0" 30SYSLINUX_PROMPT ?= "0"
31SYSLINUX_TIMEOUT ?= "50" 31SYSLINUX_TIMEOUT ?= "50"
32AUTO_SYSLINUXMENU ?= "1" 32AUTO_SYSLINUXMENU ?= "1"
33ISO_BOOTIMG = "isolinux/isolinux.bin"
34ISO_BOOTCAT = "isolinux/boot.cat"
35MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
36SYSLINUX_ROOT ?= "${ROOT}" 33SYSLINUX_ROOT ?= "${ROOT}"
34SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg"
35SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
37APPEND_prepend = " ${SYSLINUX_ROOT} " 36APPEND_prepend = " ${SYSLINUX_ROOT} "
38 37
39# Need UUID utility code. 38# Need UUID utility code.