From 0cfc19e6565d8e3a1aa563c59edb347f9128026f Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Mon, 8 Mar 2021 14:14:22 -0800 Subject: Update to internal 0.35 Signed-off-by: Jason M. Bills --- meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample | 4 ++-- meta-openbmc-mods/meta-wolfpass/conf/layer.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-openbmc-mods/meta-wolfpass') diff --git a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample index 493fdde0b..4b9445344 100644 --- a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample +++ b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "12" +LCONF_VERSION = "13" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -16,7 +16,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-wolfpass/conf/layer.conf b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf index 9dacd1c2b..441b4b578 100644 --- a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf +++ b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf @@ -7,8 +7,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "wolfpass" -BBFILE_PATTERN_wolfpass = "" -BBFILE_PRIORITY_wolfpass = "7" +BBFILE_PATTERN_wolfpass = "^${LAYERDIR}/" +BBFILE_PRIORITY_wolfpass = "11" LAYERSERIES_COMPAT_wolfpass = "dunfell gatesgarth" PRODUCT_GENERATION = "prl" -- cgit v1.2.3