From f994eef0aeae861857756d3cc05c49cca17bd12b Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 22 Mar 2016 02:48:21 -0700 Subject: bootimg.bbclass: only inherit syslinux when pcbios syslinux.bbclass should not be seen when use efi. Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- meta/classes/bootimg.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/classes/bootimg.bbclass') 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" COMPACT_ISODIR = "${S}/iso.z" 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_EXTRA_SPACE ?= "512" @@ -59,10 +64,10 @@ def pcbios(d): return pcbios 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 ${PCBIOS_CLASS} populate() { DEST=$1 -- cgit v1.2.3