Update Talos layer configuration for latest OpenBMC version

5 files changed, 27 insertions, 29 deletions

diff --git a/meta-rcs/meta-talos/conf/bblayers.conf.sample b/meta-rcs/meta-talos/conf/bblayers.conf.sample
index 986f6663d..4c5f2c667 100644
--- a/meta-rcs/meta-talos/conf/bblayers.conf.sample
+++ b/meta-rcs/meta-talos/conf/bblayers.conf.sample
@@ -1,37 +1,33 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "7"
+LCONF_VERSION = "8"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-virtualization \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-openpower \
+  ##OEROOT##/meta-ibm \
+  ##OEROOT##/meta-rcs \
+  ##OEROOT##/meta-rcs/meta-talos \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-virtualization \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
-  ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-openpower \
+  ##OEROOT##/meta-ibm \
+  ##OEROOT##/meta-rcs \
+  ##OEROOT##/meta-rcs/meta-talos \
   "
diff --git a/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf b/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf
new file mode 100644
index 000000000..2570a9a19
--- /dev/null
+++ b/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf
@@ -0,0 +1 @@
+require conf/distro/openbmc-openpower.conf
diff --git a/meta-rcs/meta-talos/conf/layer.conf b/meta-rcs/meta-talos/conf/layer.conf
index 774c01bca..093a341b9 100644
--- a/meta-rcs/meta-talos/conf/layer.conf
+++ b/meta-rcs/meta-talos/conf/layer.conf
@@ -5,5 +5,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "talos"
-BBFILE_PATTERN_talos = ""
+BBFILE_COLLECTIONS += "talos-layer"
+BBFILE_PATTERN_talos-layer = ""
+LAYERSERIES_COMPAT_talos-layer = "thud warrior"
diff --git a/meta-rcs/meta-talos/conf/local.conf.sample b/meta-rcs/meta-talos/conf/local.conf.sample
index 77399ab01..9c49a4fa3 100644
--- a/meta-rcs/meta-talos/conf/local.conf.sample
+++ b/meta-rcs/meta-talos/conf/local.conf.sample
@@ -63,7 +63,7 @@ MACHINE ??= "talos"
 # Ultimately when creating custom policy, people will likely end up subclassing
 # these defaults.
 #
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-talos"
 # 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 
 # source control systems. This is just mentioned here as an example, its not
diff --git a/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-rcs/meta-talos/conf/machine/talos.conf
index 352dea78e..60684da70 100644
--- a/meta-rcs/meta-talos/conf/machine/talos.conf
+++ b/meta-rcs/meta-talos/conf/machine/talos.conf
@@ -16,14 +16,14 @@ PHOSPHOR_MRW_URI = "git://scm.raptorcs.com/scm/git/talos-xml;protocol=https"
 PHOSPHOR_MRW_REV = "572148010e4bf8dbf9c3578bd5c1ca17d13cee73"
 
 # Inhibit phosphor-hwmon-config-mrw
-VIRTUAL-RUNTIME_phosphor-hwmon-config = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
 
 # Inhibit phosphor-fan-presence-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
     "phosphor-fan-presence-config-native"
 
 # Inhibit phosphor-fan-control-fan-config-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
     "phosphor-fan-control-fan-config-native"
 
 DISTRO_FEATURES_append = "\