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 <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
index 33c2aba..043200a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
@@ -1,9 +1,10 @@
SUMMARY = "Sample channel configuration for phosphor-host-ipmid"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-ipmi-channel-config"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
index 933fd3b..2cba63d 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
@@ -1,7 +1,8 @@
SUMMARY = "Phosphor IPMI daemon configuration"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-inherit obmc-phosphor-license
inherit allarch
SRC_URI = " \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
index a44774e..734aca1 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
@@ -4,10 +4,11 @@
files generated by gen-ipmi-fru.pl into a single config file. \
fru-gen parser parses the merged config file and generates cpp file"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
DEPENDS += "virtual/phosphor-ipmi-fru-read-inventory"
DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
index 0a1c8bd..31fba5a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "FRU properties config for ipmi-fru-parser"
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-ipmi-fru
inherit mrw-xml
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
index 8040f88..02f4514 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "FRU properties config for ipmi-fru-parser"
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-ipmi-fru
SRC_URI += "file://extra-properties.yaml"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
index 2f845d5..1cd726f 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "BMC accesible FRU inventory map for phosphor-ipmi-host"
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-ipmi-host
SRC_URI += "file://bmc-fru-config.yaml"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
index 029e6a3..6c0da6c 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "The inventory map of frus not sent by host for phosphor-ipmi-host"
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-ipmi-host
SRC_URI += "file://fru-config-not-sent-by-host.yaml"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
index 30c2443..99036b5 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb
@@ -1,6 +1,7 @@
SUMMARY = "Whitelisted IPMI FRU Parser commands"
DESCRIPTION = "Whitelisted IPMI FRU Parser commands for OpenBMC"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-inherit obmc-phosphor-license
inherit native
-inherit phosphor-ipmi-host-whitelist
\ No newline at end of file
+inherit phosphor-ipmi-host-whitelist
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index da061d1..2502065 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -2,12 +2,13 @@
DESCRIPTION = "Phosphor OpenBMC IPMI router and plugin libraries"
PR = "r1"
PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
RRECOMMENDS_${PN} += "packagegroup-obmc-ipmid-providers-libs"
inherit autotools pkgconfig
inherit obmc-phosphor-ipmiprovider-symlink
-inherit obmc-phosphor-license
inherit obmc-phosphor-sdbus-service
inherit obmc-phosphor-systemd
inherit phosphor-ipmi-host
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
index f04d89f..6989358 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "Inventory to Sensor config for phosphor-host-ipmi"
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-ipmi-host
inherit mrw-xml
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
index 272e533..b99ccc7 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb
@@ -1,9 +1,10 @@
SUMMARY = "Inventory to Sensor config for non-mrw machines"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-ipmi-inventory-sel"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
index 6edaad3..7e0c352 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
@@ -3,9 +3,10 @@
HOMEPAGE = "https://github.com/openbmc/phosphor-net-ipmid"
PR = "r1"
PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
inherit autotools pkgconfig
-inherit obmc-phosphor-license
inherit obmc-phosphor-systemd
DEPENDS += "autoconf-archive-native"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
index 7fe9ae3..dfbb938 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "OpenBMC - IPMI sensors"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
-inherit obmc-phosphor-license
OBMC_IPMI_SENSORS_PROVIDERS = "phosphor-ipmi-sensor-inventory-mrw-config-native"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
index a33eb2b..a01a543 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "sensor config for phosphor-host-ipmid"
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-ipmi-host
SRC_URI += "file://config.yaml"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
index e58e02a..5d679b4 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "sensor config for phosphor-host-ipmid"
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-ipmi-host
inherit pythonnative
inherit mrw-xml
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
index 2464ff0..4e58cf4 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb
@@ -1,9 +1,10 @@
SUMMARY = "Sensor config for phosphor-host-ipmi"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-ipmi-sensor-inventory"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool_git.bb
index 9366293..e94b80a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-tool_git.bb
@@ -3,8 +3,8 @@
HOMEPAGE = "https://github.com/openbmc/ipmitool"
PR = "r1"
PV = "1.0+git${SRCPV}"
-
-inherit obmc-phosphor-license
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9aa91e13d644326bf281924212862184"
DEPENDS += "systemd \
phosphor-ipmi-host \