diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 20:48:01 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 20:48:01 +0300 |
| commit | e34bf49e742be2f94a54795b794b88b4452e89a5 (patch) | |
| tree | 2687a84713b6a2bab09eaa87d059b4d1d06a5199 /meta-phosphor/conf/local.conf.sample | |
| parent | 37eda0c49a9fc0a15002500e40da9c8bec70ebf3 (diff) | |
| parent | 0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624 (diff) | |
| download | openbmc-e34bf49e742be2f94a54795b794b88b4452e89a5.tar.xz | |
Merge commit '0d2b029c7fbf4abaa0b34bfc4a8ea77bae71c624' into HEAD
Diffstat (limited to 'meta-phosphor/conf/local.conf.sample')
| -rw-r--r-- | meta-phosphor/conf/local.conf.sample | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample index e6b6d662b..6a919278d 100644 --- a/meta-phosphor/conf/local.conf.sample +++ b/meta-phosphor/conf/local.conf.sample @@ -34,7 +34,7 @@ #MACHINE ?= "edgerouter" # # This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "qemuphosphor" +MACHINE ??= "qemuarm" # # Where to place downloads @@ -242,3 +242,5 @@ INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ " + +require conf/machine/include/sample.inc |