From 71d01e28379854c40733a6a81964afe74d13c31f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 7 Nov 2018 12:44:15 -0800 Subject: meta-ingrasys: master refresh 94d26b9f7d..c5f9312e58 Update meta-ingrasys to master HEAD. Patrick Venture (5): meta-ingrasys: add INGRASYSBASE meta-ingrasys: zaius: ipmi-inventory-map-native: set LICENSE field meta-ingrasys: zaius: chassis: avsbus-control: set LICENSE field meta-ingrasys: zaius: chassis: refclock-fixup: set LICENSE field meta-ingrasys: zaius: chassis: vcs-control: set LICENSE field Change-Id: I58d8793a08e2e8333ccc4f71608365dec0ff8a8e Signed-off-by: Brad Bishop --- meta-ingrasys/conf/layer.conf | 3 +++ meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb | 3 ++- meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb | 3 ++- meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb | 3 ++- .../recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb | 3 ++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index fb3404fbb..05c40a981 100644 --- a/meta-ingrasys/conf/layer.conf +++ b/meta-ingrasys/conf/layer.conf @@ -4,3 +4,6 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "ingrasys" BBFILE_PATTERN_ingrasys = "" LAYERSERIES_COMPAT_ingrasys = "sumo" + +# Provide a variable that points the base of the ingrasys layer. +INGRASYSBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb index 29f36a4f2..164a9e75b 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -1,9 +1,10 @@ SUMMARY = "Zaius AVSBus control" DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Zaius" PR = "r0" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license TMPL_OFF = "avsbus-disable@.service" TMPL_ON = "avsbus-enable@.service" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb index bd33c6382..4784f3172 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Zaius host reference clock fixup" PR = "r0" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license TMPL = "op-refclock-fixup@.service" INSTFMT = "op-refclock-fixup@{0}.service" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index 98fb89b5c..f33fe0dc2 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -1,9 +1,10 @@ SUMMARY = "Zaius VCS rail control" DESCRIPTION = "VCS voltage rail control implementation for Zaius" PR = "r0" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license PROVIDES += 'virtual/p9-vcs-workaround' RPROVIDES_${PN} += 'virtual-p9-vcs-workaround' diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb index 96d167450..e0ccc28b2 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Zaius IPMI to DBus Inventory mapping." PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license inherit phosphor-ipmi-fru SRC_URI += "file://config.yaml" -- cgit v1.2.1