diff options
Diffstat (limited to 'meta-microsoft')
| -rwxr-xr-x | meta-microsoft/conf/layer.conf | 2 | ||||
| -rwxr-xr-x | meta-microsoft/meta-olympus/conf/layer.conf | 2 | ||||
| -rwxr-xr-x | meta-microsoft/meta-olympus/conf/local.conf.sample | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/meta-microsoft/conf/layer.conf b/meta-microsoft/conf/layer.conf index 03c6d8fc7..498b391ed 100755 --- a/meta-microsoft/conf/layer.conf +++ b/meta-microsoft/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "microsoft-layer" BBFILE_PATTERN_microsoft-layer = "" -LAYERSERIES_COMPAT_microsoft-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_microsoft-layer = "hardknott" diff --git a/meta-microsoft/meta-olympus/conf/layer.conf b/meta-microsoft/meta-olympus/conf/layer.conf index 1132bedd2..db4714534 100755 --- a/meta-microsoft/meta-olympus/conf/layer.conf +++ b/meta-microsoft/meta-olympus/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "olympus-layer" BBFILE_PATTERN_olympus-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_olympus-layer = "6" -LAYERSERIES_COMPAT_olympus-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_olympus-layer = "hardknott" diff --git a/meta-microsoft/meta-olympus/conf/local.conf.sample b/meta-microsoft/meta-olympus/conf/local.conf.sample index ef46e0c03..dc18dce8b 100755 --- a/meta-microsoft/meta-olympus/conf/local.conf.sample +++ b/meta-microsoft/meta-olympus/conf/local.conf.sample @@ -237,8 +237,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" CONF_VERSION = "1" # Set the root password to '0penBmc' -INHERIT += "extrausers" - -EXTRA_USERS_PARAMS = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ - " +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc |