diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 01:14:22 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 02:20:11 +0300 |
| commit | 0cfc19e6565d8e3a1aa563c59edb347f9128026f (patch) | |
| tree | 7146561723137e206a983483b06466d7ab5a9e2a /meta-openbmc-mods/meta-wht/conf | |
| parent | 930df2e58b9725756edbccf99fd4979026fc28fd (diff) | |
| download | openbmc-0cfc19e6565d8e3a1aa563c59edb347f9128026f.tar.xz | |
Update to internal 0.35
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-wht/conf')
| -rw-r--r-- | meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample | 8 | ||||
| -rw-r--r-- | meta-openbmc-mods/meta-wht/conf/layer.conf | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample index 3fe594301..f76660ab9 100644 --- a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample +++ b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample @@ -1,12 +1,12 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "12" +LCONF_VERSION = "13" BBPATH = "${TOPDIR}" BBFILES ?= "" -# meta-intel has a config file that needs to be overridden -BBMASK = "/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb" +# meta-intel-openbmc has a config file that needs to be overridden +BBMASK = "/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb" BBLAYERS ?= " \ ##OEROOT##/meta \ @@ -19,7 +19,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-x86 \ ##OEROOT##/meta-openbmc-mods \ - ##OEROOT##/meta-intel \ + ##OEROOT##/meta-intel-openbmc \ ##OEROOT##/meta-openbmc-mods/meta-common \ ##OEROOT##/meta-openbmc-mods/meta-common-small \ ##OEROOT##/meta-openbmc-mods/meta-ast2500 \ diff --git a/meta-openbmc-mods/meta-wht/conf/layer.conf b/meta-openbmc-mods/meta-wht/conf/layer.conf index 7daf9ddc8..4ce9453f7 100644 --- a/meta-openbmc-mods/meta-wht/conf/layer.conf +++ b/meta-openbmc-mods/meta-wht/conf/layer.conf @@ -7,8 +7,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "wht" -BBFILE_PATTERN_wht = "" -BBFILE_PRIORITY_wht = "7" +BBFILE_PATTERN_wht = "^${LAYERDIR}/" +BBFILE_PRIORITY_wht = "11" LAYERSERIES_COMPAT_wht = "dunfell gatesgarth" PRODUCT_GENERATION = "wht" |