bootimg.bbclass: only inherit syslinux when pcbios
syslinux.bbclass should not be seen when use efi. (From OE-Core rev: f994eef0aeae861857756d3cc05c49cca17bd12b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1b1de89304
commit
e0bc781ce0
|
@ -59,7 +59,6 @@ inherit ${EFI_CLASS}
|
||||||
|
|
||||||
DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
|
DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
|
||||||
ROOT_VM ?= "root=/dev/sda2"
|
ROOT_VM ?= "root=/dev/sda2"
|
||||||
SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg"
|
|
||||||
|
|
||||||
boot_direct_populate() {
|
boot_direct_populate() {
|
||||||
dest=$1
|
dest=$1
|
||||||
|
|
|
@ -40,6 +40,11 @@ EFIIMGDIR = "${S}/efi_img"
|
||||||
COMPACT_ISODIR = "${S}/iso.z"
|
COMPACT_ISODIR = "${S}/iso.z"
|
||||||
COMPRESSISO ?= "0"
|
COMPRESSISO ?= "0"
|
||||||
|
|
||||||
|
ISOLINUXDIR ?= "/isolinux"
|
||||||
|
ISO_BOOTIMG = "isolinux/isolinux.bin"
|
||||||
|
ISO_BOOTCAT = "isolinux/boot.cat"
|
||||||
|
MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
|
||||||
|
|
||||||
BOOTIMG_VOLUME_ID ?= "boot"
|
BOOTIMG_VOLUME_ID ?= "boot"
|
||||||
BOOTIMG_EXTRA_SPACE ?= "512"
|
BOOTIMG_EXTRA_SPACE ?= "512"
|
||||||
|
|
||||||
|
@ -59,10 +64,10 @@ def pcbios(d):
|
||||||
return pcbios
|
return pcbios
|
||||||
|
|
||||||
PCBIOS = "${@pcbios(d)}"
|
PCBIOS = "${@pcbios(d)}"
|
||||||
|
PCBIOS_CLASS = "${@['','syslinux'][d.getVar('PCBIOS', True) == '1']}"
|
||||||
|
|
||||||
# The syslinux is required for the isohybrid command and boot catalog
|
|
||||||
inherit syslinux
|
|
||||||
inherit ${EFI_CLASS}
|
inherit ${EFI_CLASS}
|
||||||
|
inherit ${PCBIOS_CLASS}
|
||||||
|
|
||||||
populate() {
|
populate() {
|
||||||
DEST=$1
|
DEST=$1
|
||||||
|
|
|
@ -3,7 +3,6 @@ INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
|
||||||
INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
|
INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
|
||||||
ROOT_LIVE ?= "root=/dev/ram0"
|
ROOT_LIVE ?= "root=/dev/ram0"
|
||||||
LABELS_LIVE ?= "boot install"
|
LABELS_LIVE ?= "boot install"
|
||||||
SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
|
|
||||||
|
|
||||||
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
|
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \
|
do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \
|
||||||
syslinux-native:do_populate_sysroot"
|
syslinux-native:do_populate_sysroot"
|
||||||
|
|
||||||
ISOLINUXDIR = "/isolinux"
|
ISOLINUXDIR ?= "/isolinux"
|
||||||
SYSLINUXDIR = "/"
|
SYSLINUXDIR = "/"
|
||||||
# The kernel has an internal default console, which you can override with
|
# The kernel has an internal default console, which you can override with
|
||||||
# a console=...some_tty...
|
# a console=...some_tty...
|
||||||
|
@ -30,10 +30,9 @@ SYSLINUX_SERIAL_TTY ?= "console=ttyS0,115200"
|
||||||
SYSLINUX_PROMPT ?= "0"
|
SYSLINUX_PROMPT ?= "0"
|
||||||
SYSLINUX_TIMEOUT ?= "50"
|
SYSLINUX_TIMEOUT ?= "50"
|
||||||
AUTO_SYSLINUXMENU ?= "1"
|
AUTO_SYSLINUXMENU ?= "1"
|
||||||
ISO_BOOTIMG = "isolinux/isolinux.bin"
|
|
||||||
ISO_BOOTCAT = "isolinux/boot.cat"
|
|
||||||
MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
|
|
||||||
SYSLINUX_ROOT ?= "${ROOT}"
|
SYSLINUX_ROOT ?= "${ROOT}"
|
||||||
|
SYSLINUX_CFG_VM ?= "${S}/syslinux_vm.cfg"
|
||||||
|
SYSLINUX_CFG_LIVE ?= "${S}/syslinux_live.cfg"
|
||||||
APPEND_prepend = " ${SYSLINUX_ROOT} "
|
APPEND_prepend = " ${SYSLINUX_ROOT} "
|
||||||
|
|
||||||
# Need UUID utility code.
|
# Need UUID utility code.
|
||||||
|
|
Loading…
Reference in New Issue