diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-18 15:52:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-18 15:52:02 +0000 |
| commit | 8048b714cd57c89aecfac438af3c7094a770fb9b (patch) | |
| tree | a11ac3e0080c1cf3fdde133429f7da3e17e8b9d5 /meta/conf/local.conf.sample | |
| parent | 673abd92f999829bdd67d0273c43570a62123a63 (diff) | |
| download | poky-8048b714cd57c89aecfac438af3c7094a770fb9b.tar.gz | |
local.conf.sample: Handle the case the user incomments a machine entry and expects it to override the default
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/local.conf.sample')
| -rw-r--r-- | meta/conf/local.conf.sample | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index 9cd1d7d217..65b508717f 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample | |||
| @@ -15,8 +15,9 @@ CONF_VERSION = "1" | |||
| 15 | # Also, make can be passed flags so it run parallel threads e.g.: | 15 | # Also, make can be passed flags so it run parallel threads e.g.: |
| 16 | # PARALLEL_MAKE = "-j 4" | 16 | # PARALLEL_MAKE = "-j 4" |
| 17 | 17 | ||
| 18 | # The machine to target | 18 | # Set a default machine to target unless a machine is selected from the |
| 19 | MACHINE ?= "qemux86" | 19 | # lists below. |
| 20 | MACHINE ??= "qemux86" | ||
| 20 | 21 | ||
| 21 | # Supported emulation machines | 22 | # Supported emulation machines |
| 22 | #MACHINE ?= "qemuarm" | 23 | #MACHINE ?= "qemuarm" |