diff options
Diffstat (limited to 'meta-alibaba/meta-thor')
| -rw-r--r-- | meta-alibaba/meta-thor/conf/bblayers.conf.sample | 2 | ||||
| -rw-r--r-- | meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf | 1 | ||||
| -rw-r--r-- | meta-alibaba/meta-thor/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-alibaba/meta-thor/conf/local.conf.sample | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/meta-alibaba/meta-thor/conf/bblayers.conf.sample b/meta-alibaba/meta-thor/conf/bblayers.conf.sample index 50cc08f71..1884f55ef 100644 --- a/meta-alibaba/meta-thor/conf/bblayers.conf.sample +++ b/meta-alibaba/meta-thor/conf/bblayers.conf.sample @@ -9,6 +9,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-alibaba \ @@ -20,6 +21,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-alibaba \ diff --git a/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf b/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf deleted file mode 100644 index de15fbcc6..000000000 --- a/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf +++ /dev/null @@ -1 +0,0 @@ -require conf/distro/include/phosphor-base.inc diff --git a/meta-alibaba/meta-thor/conf/layer.conf b/meta-alibaba/meta-thor/conf/layer.conf index 149bdf8fd..89eca706a 100644 --- a/meta-alibaba/meta-thor/conf/layer.conf +++ b/meta-alibaba/meta-thor/conf/layer.conf @@ -6,4 +6,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "" BBFILE_PATTERN := "^${LAYERDIR}/" -LAYERSERIES_COMPAT = "dunfell gatesgarth" +LAYERSERIES_COMPAT = "gatesgarth hardknott" diff --git a/meta-alibaba/meta-thor/conf/local.conf.sample b/meta-alibaba/meta-thor/conf/local.conf.sample index 09c441fee..fbae84b73 100644 --- a/meta-alibaba/meta-thor/conf/local.conf.sample +++ b/meta-alibaba/meta-thor/conf/local.conf.sample @@ -58,9 +58,9 @@ DL_DIR ?= "${TOPDIR}/../downloads" # Ultimately when creating custom policy, people will likely end up subclassing # these defaults. # -DISTRO ?= "alibaba-openbmc" +DISTRO ?= "openbmc-phosphor" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" |