summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-18 11:04:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-21 09:34:40 +0100
commit83d791089fb220553d4df144f56ebea61d9e0713 (patch)
tree76d131c07f8298655469aafe9f13d6cd957f418b /meta/conf/machine
parent25a2244265a14bb1b1585fb406f2b9a722055011 (diff)
downloadpoky-83d791089fb220553d4df144f56ebea61d9e0713.tar.gz
image/image-live: Improve handling of live/iso/hddimg types (drop NOISO/NOHDD)
The logic can be improved and the historical NOISO/NOHDD variables moved into the class and out of common code. The variables are also then removed in favour of directly controlling the behaviour from IMAGE_FSTYPES in line with all the other image types. (From OE-Core rev: a052caed563a09a01f5a3ea1f0477f379c05bee0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/x86-base.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index f8aacea64c..0edcea7f56 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -10,8 +10,7 @@ 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 ?= "live" 13IMAGE_FSTYPES ?= "hddimg"
14NOISO ?= "1"
15 14
16KERNEL_IMAGETYPE ?= "bzImage" 15KERNEL_IMAGETYPE ?= "bzImage"
17 16