summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-07-30 13:30:56 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-09 09:24:16 +0100
commitb8cb2bb17508020899a5ffaa29aee941922d68e0 (patch)
tree255a6568d09f528db277f61e0f09355e3a77f495 /meta/conf
parent6a6d2d1853dc0e42cce1de2702b86c37627f84ff (diff)
downloadpoky-b8cb2bb17508020899a5ffaa29aee941922d68e0.tar.gz
x86-base.inc: enable live image type
live image type was replaced by hddimg recently. This made NOHDD and NOISO options ineffective as they only influence live builds. It also causes image building failure for image sizes >4Gb Returned back live image type and disabled building iso image. This doesn't change result (hddimg is built), but it makes NOHDD and NOISO working as expected. [YOCTO #11842] (From OE-Core rev: c787dcdd55bc55c6c64dec21b251706615114fe7) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/x86-base.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index a29641aec4..bc0c27b73e 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -10,7 +10,8 @@ MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \
10 10
11MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" 11MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
12 12
13IMAGE_FSTYPES ?= "hddimg" 13IMAGE_FSTYPES ?= "live"
14NOISO ?= "1"
14 15
15KERNEL_IMAGETYPE ?= "bzImage" 16KERNEL_IMAGETYPE ?= "bzImage"
16 17