From 75f0387b264b4d06b5d66a01acfa205adb26583e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sat, 3 Nov 2018 09:41:57 -0700 Subject: meta-phosphor: master refresh 3026b0fa5a..d76a657a63 Update meta-phosphor to master HEAD. Patrick Venture (52): meta-phosphor: obmc-console: set LICENSE field meta-phosphor: dbus-interfaces: set LICENSE field meta-phosphor: rest-dbus: set LICENSE field meta-phosphor: slpd-lite: set LICENSE field meta-phosphor: ipmi-host: set LICENSE field meta-phosphor: ipmi-net: set LICENSE field meta-phosphor: network: inarp: set LICENSE field meta-phosphor: network: set LICENSE field meta-phosphor: logging: set LICENSE field meta-phosphor: ipmi-tool: fixup LICENSE meta-phosphor: clear-once: set LICENSE field meta-phosphor: preinit-mounts: set LICENSE field meta-phosphor: systemd: obmc-targets: set LICENSE field meta-phosphor: dbus: perms: set LICENSE field meta-phosphor: dbus-interfaces-mapper-config-native: set LICENSE field meta-phosphor: dbus-monitor-config-native: set LICENSE field meta-phosphor: legacy-namespace-mapper-config-native: set LICENSE field meta-phosphor: mapper-config-native: set LICENSE field meta-phosphor: obmc-host-failure-reboots: set LICENSE field meta-phosphor: fan-control-events-config-native: set LICENSE field meta-phosphor: fan-control-fan-config-native: set LICENSE field meta-phosphor: fan-control-zone-conditions-config-native: set LICENSE field meta-phosphor: fan-control-zone-config-native: set LICENSE field meta-phosphor: fan-monitor-config-native: set LICENSE field meta-phosphor: fan-presence-config-native: set LICENSE field meta-phosphor: image-signing: set LICENSE field meta-phosphor: insecure-signing-key-native: set LICENSE field meta-phosphor: inventory-manager-assettag-native: set LICENSE field meta-phosphor: inventory-manager-config-native: set LICENSE field meta-phosphor: ipmi-channel-inventory-native: set LICENSE field meta-phosphor: ipmi-config: set LICENSE field meta-phosphor: ipmi-fru-merge-config-native: set LICENSE field meta-phosphor: ipmi-fru-properties-native: set LICENSE field meta-phosphor: ipmi-fru-read-bmc-inventory-native: set LICENSE field meta-phosphor: ipmi-fru-read-not-sent-by-host-inventory-native: set LICENSE field meta-phosphor: ipmi-fru-whitelist-native: set LICENSE field meta-phosphor: ipmi-inventory-sel-native: set LICENSE field meta-phosphor: ipmi-sensor-config-native: set LICENSE field meta-phosphor: ipmi-sensor-inventory-native: set LICENSE field meta-phosphor: logging-callouts-example-native: set LICENSE field meta-phosphor: logging-error-logs-native: set LICENSE field meta-phosphor: settings-defaults-native: set LICENSE field meta-phosphor: fan-presence-mrw-native: set LICENSE field meta-phosphor: fan-control-fan-config-mrw-native: set LICENSE field meta-phosphor: ipmi-fru-properties-mrw-native: set LICENSE field meta-phosphor: ipmi-inventory-sel-mrw-native: set LICENSE field meta-phosphor: ipmi-sensor-inventory-mrw-config-native: set LICENSE field meta-phosphor: ipmi-sensor-inventory-mrw-native: set LICENSE field meta-phosphor: led-manager-config-mrw-native: set LICENSE field meta-phosphor: logging-callouts-mrw-native: set LICENSE field meta-phosphor: hwmon-config-mrw: set LICENSE field meta-phosphor: settings-read-settings-mrw-native: set LICENSE field Change-Id: Ibe919c3f1a748fae67b45ff6908a236b08902450 Signed-off-by: Brad Bishop --- .../recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb | 3 ++- .../fans/phosphor-fan-control-fan-config-mrw-native.bb | 3 ++- .../recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb | 3 ++- .../fans/phosphor-fan-control-zone-conditions-config-native.bb | 3 ++- .../recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb | 3 ++- .../recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb | 3 ++- .../recipes-phosphor/fans/phosphor-fan-presence-config-native.bb | 3 ++- .../recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/fans') diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb index 740b194ad..9d42d78c9 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Phosphor zone events definition default data" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-fan SRC_URI += "file://events.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb index 7ae05ce80..81dfa6b37 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Generate fan control YAML from the MRW" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-fan inherit mrw-xml diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb index 76b0985ca..516fa0020 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Phosphor fan definition example data" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-fan PROVIDES += "virtual/phosphor-fan-control-fan-config" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb index 065efa539..f4f5f573a 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Phosphor zone conditions definition default data" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-fan SRC_URI += "file://zone_conditions.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb index 4d8759e47..43f146262 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Phosphor fan zone definition default data" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-fan SRC_URI += "file://zones.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb index 02420e43e..e8fa54be7 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Phosphor fan monitor definition default data" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-fan SRC_URI += "file://monitor.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb index 0eb38737c..fca15a316 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb @@ -6,10 +6,11 @@ SUMMARY = "Config file for phosphor-fan-presence" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native inherit phosphor-fan -inherit obmc-phosphor-license PROVIDES += "virtual/phosphor-fan-presence-config" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb index 47dc2a4a1..70a3f8254 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Generate fan presence YAML from the MRW" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-fan inherit mrw-xml -- cgit v1.2.3