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>

6 files changed, 14 insertions, 6 deletions

diff --git a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb
index 8290ecce2..1ba73d81f 100644
--- a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb
@@ -2,9 +2,10 @@ SUMMARY = "Phosphor OpenBMC DBUS Permissions"
 DESCRIPTION = "Phosphor OpenBMC DBUS Permissions."
 HOMEPAGE = "http://github.com/openbmc/"
 PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
 inherit allarch
-inherit obmc-phosphor-license
 inherit dbus-dir
 
 SRC_URI += "file://org.openbmc.conf"
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
index 0869c3f6a..69cb14faa 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb
@@ -3,9 +3,11 @@ DESCRIPTION="Add the xyz.openbmc_project service namespace and \
 xyz.openbmc_project interface prefix to the mapper \
 watch list."
 
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
 inherit phosphor-mapper
 inherit native
-inherit obmc-phosphor-license
 
 PHOSPHOR_MAPPER_SERVICE_append = " xyz.openbmc_project"
 PHOSPHOR_MAPPER_INTERFACE_append = " xyz.openbmc_project"
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
index 7b94e1185..4b612e1d1 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Generated bindings, using sdbus++, for the phosphor YAML"
 PR = "r1"
 PV = "1.0+git${SRCPV}"
 S = "${WORKDIR}/git"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 inherit autotools pkgconfig
-inherit obmc-phosphor-license
 inherit pythonnative
 inherit phosphor-dbus-yaml
 
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
index 228ae5a63..80954f61f 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb
@@ -3,8 +3,9 @@ DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \
 configuration files to the /usr/share/phosphor-dbus-monitor filesystem."
 HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor"
 PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
-inherit obmc-phosphor-license
 inherit native
 inherit phosphor-dbus-monitor
 
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
index 2cb5b76d7..fe0bea3d0 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb
@@ -2,9 +2,11 @@ SUMMARY="Add org.openbmc namespace to phosphor-mapper"
 DESCRIPTION="Add the legacy org.openbmc service namespace and \
 org.openbmc interface prefix to the mapper watch list."
 
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
 inherit phosphor-mapper
 inherit native
-inherit obmc-phosphor-license
 
 PHOSPHOR_MAPPER_SERVICE_append = " org.openbmc"
 PHOSPHOR_MAPPER_INTERFACE_append = " org.openbmc"
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
index befbdbc92..68163e1f3 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb
@@ -3,8 +3,9 @@ DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \
 configuration files to the native /usr/share/phosphor-mapper filesystem."
 HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr"
 PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
-inherit obmc-phosphor-license
 inherit native
 inherit phosphor-mapper