From 83d791089fb220553d4df144f56ebea61d9e0713 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 18 Jun 2018 11:04:59 +0000 Subject: 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 --- meta/conf/documentation.conf | 2 -- meta/conf/machine/include/x86-base.inc | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 254f8f1960..3189dd39b7 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -288,8 +288,6 @@ MULTIMACH_TARGET_SYS[doc] = "Separates files for different machines such that yo NATIVELSBSTRING[doc] = "A string identifying the host distribution." NO_RECOMMENDATIONS[doc] = "When set to '1', no recommended packages will be installed. Realize that some recommended packages might be required for certain system functionality, such as kernel-modules. It is up to the user to add packages to IMAGE_INSTALL as needed." -NOHDD[doc] = "Causes the OpenEmbedded build system to skip building the .hddimg image." -NOISO[doc] = "Causes the OpenEmbedded build system to skip building the ISO image." #O 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 \ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" -IMAGE_FSTYPES ?= "live" -NOISO ?= "1" +IMAGE_FSTYPES ?= "hddimg" KERNEL_IMAGETYPE ?= "bzImage" -- cgit v1.2.3-54-g00ecf