From 2879d326eb675a9e49447739918589c8814f015d Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 7 Nov 2018 14:45:23 -0500 Subject: meta-openpower: master refresh afc774a7f5..e9a2e1a2d8 Update meta-openpower to master HEAD. Brad Bishop (1): openpower: Add OPENPOWERBASE Patrick Venture (11): meta-openpower: dbus-interfaces-mapper-config-native: set LICENSE field meta-openpower: op-fsi: set LICENSE field meta-openpower: host: checkstop-monitor: set LICENSE field meta-openpower: host: hostboot-settings: set LICENSE field meta-openpower: host: p9-cfam-override: set LICENSE field meta-openpower: host: p9-host-start: set LICENSE field meta-openpower: host: p9-vcs-workaround: set LICENSE field meta-openpower: ipmi: /hostboot-inventory-config-native: set LICENSE field meta-openpower: ipmi-oem-sensor-inventory-mrw-native: set LICENSE field meta-openpower: occ-control-config-mrw-native: set LICENSE field meta-openpower: vpd: fru-inventory-example-native: set LICENSE field Change-Id: I8a40d1de336265d6c68932a5f6aec1dadbf0d4b8 Signed-off-by: Brad Bishop --- meta-openpower/conf/layer.conf | 3 +++ .../dbus/openpower-dbus-interfaces-mapper-config-native.bb | 3 ++- meta-openpower/recipes-phosphor/fsi/op-fsi.bb | 3 ++- meta-openpower/recipes-phosphor/host/checkstop-monitor.bb | 3 ++- meta-openpower/recipes-phosphor/host/hostboot-settings.bb | 3 ++- meta-openpower/recipes-phosphor/host/p9-cfam-override.bb | 3 ++- meta-openpower/recipes-phosphor/host/p9-host-start.bb | 3 ++- meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb | 3 ++- .../recipes-phosphor/ipmi/hostboot-inventory-config-native.bb | 3 ++- .../ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb | 3 ++- .../recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb | 3 ++- .../recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb | 3 ++- 12 files changed, 25 insertions(+), 11 deletions(-) (limited to 'meta-openpower') diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf index dad2abf23..bb727b5af 100644 --- a/meta-openpower/conf/layer.conf +++ b/meta-openpower/conf/layer.conf @@ -9,3 +9,6 @@ BBFILE_COLLECTIONS += "openpower-layer" BBFILE_PATTERN_openpower-layer = "^${LAYERDIR}/" LAYERVERSION_openpower-layer = "1" LAYERSERIES_COMPAT_openpower-layer = "sumo" + +# Provide a variable that points the base of the openpower layer. +OPENPOWERBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb index a8d534789..6f0771aa6 100644 --- a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb +++ b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb @@ -2,10 +2,11 @@ SUMMARY="Add /org/open_power namespace to phosphor-mapper" DESCRIPTION="Add the /org/open_power path namespace and \ org.open_power interface prefix to the mapper \ watch list." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit phosphor-mapper inherit native -inherit obmc-phosphor-license PHOSPHOR_MAPPER_SERVICE_append = " org.open_power" PHOSPHOR_MAPPER_INTERFACE_append = " org.open_power" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index 840b649f6..7af9731f5 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -1,9 +1,10 @@ SUMMARY = "FSI Services" DESCRIPTION = "Install FSI related services" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license RDEPENDS_${PN} += "op-proc-control" diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb index 4959a3b73..452cdeb87 100644 --- a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb +++ b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb @@ -1,8 +1,9 @@ SUMMARY = "OpenPOWER Host checkstop monitor application" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license inherit allarch DEPENDS += "virtual/obmc-gpio-monitor" diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb b/meta-openpower/recipes-phosphor/host/hostboot-settings.bb index 39beb480c..0a713e766 100644 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb +++ b/meta-openpower/recipes-phosphor/host/hostboot-settings.bb @@ -1,7 +1,8 @@ SUMMARY = "OpenPower Hostboot Boot settings tool" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -inherit obmc-phosphor-license inherit obmc-phosphor-systemd inherit allarch diff --git a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb index 4f6a9c653..e395841ba 100644 --- a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb +++ b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb @@ -1,9 +1,10 @@ SUMMARY = "POWER9 CFAM override" DESCRIPTION = "Applies user CFAM register overrides from file" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" RDEPENDS_${PN} += "op-proc-control" diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index 24b1b9c1f..b9110010e 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -1,9 +1,10 @@ SUMMARY = "POWER9 start host" DESCRIPTION = "Service to start POWER9 IPL through SBE" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" diff --git a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb index 11ad79cb1..43efeab24 100644 --- a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb +++ b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb @@ -1,9 +1,10 @@ SUMMARY = "POWER9 VCS workaround" DESCRIPTION = "Apply fixes over FSI to POWER9 CPUs prior to host power on" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" RDEPENDS_${PN} += "virtual-p9-vcs-workaround op-proc-control" diff --git a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb index 31aee2d7c..b60a9e38f 100644 --- a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb @@ -1,9 +1,10 @@ SUMMARY = "Hostboot hostfw inventory map for phosphor-ipmi-fru" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native inherit phosphor-ipmi-fru -inherit obmc-phosphor-license SRC_URI += "file://config.yaml" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb index 3e434b52f..b9fd60552 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb @@ -1,8 +1,9 @@ SUMMARY = "OEM sensor config for phosphor-host-ipmid" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-ipmi-host SRC_URI += "file://openpower-config.yaml" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb index e851ee1b3..1b228adb3 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb @@ -1,8 +1,9 @@ SUMMARY = "OpenPower OCC Control with MRW generated sensor IDs" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit openpower-occ-control inherit mrw-xml diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb index 8f9bd050b..e04ebd908 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Inventory config for openpower-vpd-parser" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit openpower-fru-vpd SRC_URI += "file://inventory" -- cgit v1.2.1