summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2019-04-19 08:40:37 +0000
committerTimothy Pearson <tpearson@raptorengineering.com>2019-04-25 08:02:05 +0000
commit49dfe571c691e1a6afe8957ff4bccbd7fcd20f66 (patch)
treeeb48ddc7b40da9c8f9d3684abcec6f5bfef4203e
parent7925f2acb6c1c93876ad0b26266a5f7cfe69908c (diff)
downloadblackbird-openbmc-49dfe571c691e1a6afe8957ff4bccbd7fcd20f66.tar.gz
blackbird-openbmc-49dfe571c691e1a6afe8957ff4bccbd7fcd20f66.zip
Update Talos layer configuration for latest OpenBMC version
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb6
-rw-r--r--meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb2
-rw-r--r--meta-rcs/meta-talos/conf/bblayers.conf.sample42
-rw-r--r--meta-rcs/meta-talos/conf/distro/openbmc-talos.conf1
-rw-r--r--meta-rcs/meta-talos/conf/layer.conf5
-rw-r--r--meta-rcs/meta-talos/conf/local.conf.sample2
-rw-r--r--meta-rcs/meta-talos/conf/machine/talos.conf6
-rw-r--r--meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed/talos.cfg (renamed from meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc/talos.cfg)0
-rw-r--r--meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend2
-rw-r--r--meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend2
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb4
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb4
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/console/obmc-console_%.bbappend (renamed from meta-rcs/meta-talos/recipes-phosphor/console/obmc-console.bbappend)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend)0
-rwxr-xr-xmeta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%.bbappend)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb4
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb4
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb4
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend2
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend (renamed from meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb4
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb5
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd_%.bbappend (renamed from meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd.bbappend)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules4
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules1
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/talos.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/talos.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@68.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@68.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@69.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@69.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf)0
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service5
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend (renamed from meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend)8
-rw-r--r--meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config_git.bb (renamed from meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config.bb)1
40 files changed, 66 insertions, 52 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb
index 618a75658..fc5b567be 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb
@@ -2,8 +2,12 @@ SUMMARY = "Talos II VGA Disable"
DESCRIPTION = "Talos II power on VGA disable controller"
PR = "r0"
+LICENSE = "LGPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
+ file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \
+ "
+
inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
PROVIDES += 'virtual/talos-ast-vga-disable'
RPROVIDES_${PN} += 'virtual-talos-ast-vga-disable'
diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
index b20dcf433..cddad0afe 100644
--- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
@@ -36,7 +36,6 @@ RDEPENDS_max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools"
SRC_URI += "git://scm.raptorcs.com/scm/git/phosphor-hwmon;protocol=https;branch=04-19-2018"
SRC_URI += "file://70-hwmon.rules"
-SRC_URI += "file://70-iio.rules"
SRC_URI += "file://start_hwmon.sh"
SRCREV = "5c014d2bb76f6f6d51aecf31bea95cb9ed9b1953"
@@ -47,7 +46,6 @@ do_install_append() {
install -d ${D}/${base_libdir}/udev/rules.d/
install ${WORKDIR}/70-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
- install ${WORKDIR}/70-iio.rules ${D}/${base_libdir}/udev/rules.d/
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/start_hwmon.sh ${D}${bindir}
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 = "\
diff --git a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc/talos.cfg b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed/talos.cfg
index 8182c7a23..8182c7a23 100644
--- a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc/talos.cfg
+++ b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed/talos.cfg
diff --git a/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 000000000..123c6ad79
--- /dev/null
+++ b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend_talos := "${THISDIR}/${PN}:"
+SRC_URI += "file://talos.cfg"
diff --git a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend
deleted file mode 100644
index 8ebf9d442..000000000
--- a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
-SRC_URI += "file://talos.cfg"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb b/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb
index e74682dba..a9958e459 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb
@@ -1,8 +1,10 @@
SUMMARY = "Talos II AVSBus control"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
RDEPENDS_${PN} += "i2c-tools bash"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb b/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb
index e2eb9f3b9..b9b07da8b 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb
@@ -2,8 +2,10 @@ SUMMARY = "Talos II VRM Overrides"
DESCRIPTION = "Sets Talos II VRMs to custom voltages"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
RDEPENDS_${PN} += "i2c-tools bash"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console.bbappend b/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console_%.bbappend
index 5acf3af89..5acf3af89 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console_%.bbappend
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
index 72d991c7e..72d991c7e 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
index 5bda3ccdb..5bda3ccdb 100755
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf
index 90b1e810e..90b1e810e 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf
index 240336343..240336343 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf
index 6b74301d1..6b74301d1 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
index 9a4f8df42..9a4f8df42 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 76aad1558..76aad1558 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb
index df6848d3c..d2a283870 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb
@@ -1,8 +1,10 @@
SUMMARY = "Fan policy for Talos"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit native
-inherit obmc-phosphor-license
inherit phosphor-dbus-monitor
SRC_URI += "file://air-cooled.yaml"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb
index 19be898dd..699677d47 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb
@@ -1,7 +1,9 @@
SUMMARY = "Talos fan watchdog services"
PR = "r1"
-inherit obmc-phosphor-license
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit obmc-phosphor-systemd
RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb
index 1b20e53a5..c327bb887 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb
@@ -1,8 +1,10 @@
SUMMARY = "Thermal policy for Talos"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit native
-inherit obmc-phosphor-license
inherit phosphor-dbus-monitor
SRC_URI += "file://thermal-policy.yaml"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend
index aa57bbfe6..772685db7 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1 +1 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd"
+OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd liberation-fonts uart-render-controller"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 1f0254d0f..1f0254d0f 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb b/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb
index 7dc9393fb..b8894a4d8 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb
@@ -1,8 +1,10 @@
SUMMARY = "Talos II IPMI to DBus Inventory mapping."
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit native
-inherit obmc-phosphor-license
inherit phosphor-ipmi-fru
SRC_URI += "file://config.yaml"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb b/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb
index dd8502ca3..680a9ca0c 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb
@@ -1,9 +1,10 @@
SUMMARY = "Phosphor LED Group Management for Talos II"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit native
-inherit obmc-phosphor-utils
-inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-led-manager-config-native"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd.bbappend b/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd_%.bbappend
index 8b6248a46..8b6248a46 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd_%.bbappend
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
index 070d88f51..cdc9b9c54 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
@@ -1 +1,3 @@
-SUBSYSTEM=="hwmon", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service"
+SUBSYSTEM=="hwmon", ACTION=="add", DRIVERS!="occ-hwmon", PROGRAM="/bin/systemd-escape -p '%E{OF_FULLNAME}'", RUN="/bin/systemctl start xyz.openbmc_project.Hwmon@%c.service"
+SUBSYSTEM=="hwmon", ACTION=="add", DRIVERS=="occ-hwmon", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}"
+SUBSYSTEM=="hwmon", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
deleted file mode 100644
index f332d11ac..000000000
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="iio", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/talos.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/talos.conf
index 0fc81037c..0fc81037c 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/talos.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/talos.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf
index 204de8b8b..204de8b8b 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@68.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@68.conf
index e463b517c..e463b517c 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@68.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@68.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@69.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@69.conf
index 2fadbdec0..2fadbdec0 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@69.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@69.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf
index 506687fcd..506687fcd 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 7752d2bbb..7752d2bbb 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
index d90820d8c..d90820d8c 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
index 8dca3ad4b..b930b5711 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
@@ -1,11 +1,10 @@
[Unit]
Description=Phosphor Hwmon Poller
ConditionFileNotEmpty=/etc/default/obmc/hwmon/%I.conf
-StopWhenUnneeded=true
After=xyz.openbmc_project.ObjectMapper.service
[Service]
-Restart=always
-ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f
+Restart=on-failure
+ExecStart=/usr/bin/env phosphor-hwmon-readd -o %I
SyslogIdentifier=phosphor-hwmon-readd
EnvironmentFile=/etc/default/obmc/hwmon/%I.conf
diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index b794bef1a..feacfe437 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,10 +1,10 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
TALOS_CHIPS = " \
- i2c@1e78a000/i2c-bus@440/max31785@52 \
- i2c@1e78a000/i2c-bus@440/w83773g@4c \
- i2c@1e78a000/i2c-bus@440/power-supply@68 \
- i2c@1e78a000/i2c-bus@440/power-supply@69 \
+ bus@1e78a000/i2c-bus@440/max31785@52 \
+ bus@1e78a000/i2c-bus@440/w83773g@4c \
+ bus@1e78a000/i2c-bus@440/power-supply@68 \
+ bus@1e78a000/i2c-bus@440/power-supply@69 \
"
TALOS_ITEMSFMT = "ahb/apb/{0}.conf"
TALOS_ITEMS = "${@compose_list(d, 'TALOS_ITEMSFMT', 'TALOS_CHIPS')}"
diff --git a/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config.bb b/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config_git.bb
index 03164579c..40b67663b 100644
--- a/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config.bb
+++ b/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config_git.bb
@@ -1,5 +1,6 @@
SUMMARY = "Talos II board wiring"
DESCRIPTION = "Talos II wiring information for the Talos II OpenPOWER system."
PR = "r1"
+PV = "1.0+git${SRCPV}"
inherit config-in-skeleton
OpenPOWER on IntegriCloud