From 75f0387b264b4d06b5d66a01acfa205adb26583e Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
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 <bradleyb@fuzziesquirrel.com>
---
 .../recipes-phosphor/settings/phosphor-settings-defaults-native.bb     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb')

diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
index 37b8d4ef6..ad156f988 100644
--- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb
@@ -1,8 +1,9 @@
 SUMMARY = "Default settings"
 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-settings-manager
 
 SRC_URI += "file://defaults.yaml"
-- 
cgit v1.2.1