diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/documentation.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/x86-base.inc | 3 |
2 files changed, 1 insertions, 4 deletions
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 | |||
288 | 288 | ||
289 | NATIVELSBSTRING[doc] = "A string identifying the host distribution." | 289 | NATIVELSBSTRING[doc] = "A string identifying the host distribution." |
290 | 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." | 290 | 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." |
291 | NOHDD[doc] = "Causes the OpenEmbedded build system to skip building the .hddimg image." | ||
292 | NOISO[doc] = "Causes the OpenEmbedded build system to skip building the ISO image." | ||
293 | 291 | ||
294 | #O | 292 | #O |
295 | 293 | ||
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 | ||
11 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" | 11 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" |
12 | 12 | ||
13 | IMAGE_FSTYPES ?= "live" | 13 | IMAGE_FSTYPES ?= "hddimg" |
14 | NOISO ?= "1" | ||
15 | 14 | ||
16 | KERNEL_IMAGETYPE ?= "bzImage" | 15 | KERNEL_IMAGETYPE ?= "bzImage" |
17 | 16 | ||