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 --- .../logging/phosphor-logging-callouts-example-native.bb | 3 ++- .../recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb | 3 ++- .../recipes-phosphor/logging/phosphor-logging-error-logs-native.bb | 3 ++- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/logging') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb index f76d202e1..434d5d02a 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Generated callout information for phosphor-logging" 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-logging SRC_URI += "file://callouts.yaml" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb index 96852d4ca..be53df536 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Generated callout information for phosphor-logging" 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-logging inherit mrw-xml diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb index 0dfacb1b6..ddb7faa5e 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Phosphor OpenBMC - error log meta data generation" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license #To append new recipes that copies error yaml files to the known #location, add DEPENDS relationhip using bbappend to diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index d2e094266..2f212d10c 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -4,10 +4,11 @@ DESCRIPTION = "An error and event log daemon application, and \ HOMEPAGE = "https://github.com/openbmc/phosphor-logging" PR = "r1" PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig inherit pythonnative -inherit obmc-phosphor-license inherit obmc-phosphor-dbus-service inherit phosphor-logging inherit phosphor-dbus-yaml -- cgit v1.2.3