diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-03-22 02:48:21 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-24 21:44:26 +0000 |
| commit | f994eef0aeae861857756d3cc05c49cca17bd12b (patch) | |
| tree | 8cb737b9787bfd9ace0ed919b6c14579b368a22b /meta/classes/bootimg.bbclass | |
| parent | e38039e43f22d55a443064efa91752e2943fda79 (diff) | |
| download | openembedded-core-contrib-f994eef0aeae861857756d3cc05c49cca17bd12b.tar.gz | |
bootimg.bbclass: only inherit syslinux when pcbios
syslinux.bbclass should not be seen when use efi.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/bootimg.bbclass')
| -rw-r--r-- | meta/classes/bootimg.bbclass | 9 |
1 files changed, 7 insertions, 2 deletions
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 |