diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-11-07 23:50:34 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-11-08 04:58:23 +0300 |
| commit | 9921ced5889d7c3d376c07927d4a5d07dbea890e (patch) | |
| tree | b1ef4df60b320d997a248198b8c0db19da62ca0c /meta-qualcomm | |
| parent | 86e8260b1dc71dc9bd9bf13803e0bddaa6a451df (diff) | |
| download | openbmc-9921ced5889d7c3d376c07927d4a5d07dbea890e.tar.xz | |
meta-qualcomm: master refresh 2d5d845e7d..7272549020
Update meta-qualcomm to master HEAD.
Patrick Venture (6):
meta-qualcomm: add QUALCOMMBASE
meta-qualcomm: centriq2400-rep: ir38163-workaround: set LICENSE field
meta-qualcomm: centriq2400-rep: console-client: set LICENSE field
meta-qualcomm: centriq2400-rep: led-manager-config-native: set LICENSE field
meta-qualcomm: centriq2400-rep: socupdate: set LICENSE field
meta-qualcomm: centriq2400-rep: rep-config: set LICENSE field
Change-Id: I818424bf2e7e8af8aaf97fa4fcfd1b0476e5748e
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-qualcomm')
6 files changed, 13 insertions, 5 deletions
diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf index 5079054e3..51c563e86 100644 --- a/meta-qualcomm/conf/layer.conf +++ b/meta-qualcomm/conf/layer.conf @@ -3,3 +3,6 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "qualcomm" BBFILE_PATTERN_qualcomm = "" + +# Provide a variable that points the base of the qualcomm layer. +QUALCOMMBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb index 85c2e93b0..c7169a999 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb @@ -1,9 +1,10 @@ SUMMARY = "centriq2400 VR sensor Re-Probe" DESCRIPTION = "IR38163 work on DC on state, need re-probe for centriq2400 HW design" PR = "r0" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit obmc-phosphor-systemd -inherit obmc-phosphor-license PROVIDES += 'virtual/ir38163-workaround' RPROVIDES_${PN} += 'virtual-ir38163-workaround' diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb index 4c8dc153f..eb7ed1f78 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/console/centriq-2400rep-console-client.bb @@ -1,5 +1,6 @@ FILESEXTRAPATHS_prepend_centriq2400-rep := "${THISDIR}/${PN}:" -inherit obmc-phosphor-license +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI += "file://centriq-2400rep-console-client.sh" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb index 7d0e777a4..6e4d51744 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb @@ -1,8 +1,9 @@ SUMMARY = "Phosphor LED Group Management for Centriq2400 REP" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit native -inherit obmc-phosphor-license PROVIDES += "virtual/phosphor-led-manager-config-native" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb index 45f69d335..16b11a346 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb @@ -2,8 +2,9 @@ SUMMARY = "Qualcomm SOC update" DESCRIPTION = "" HOMEPAGE = "" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -inherit obmc-phosphor-license SRC_URI += "file://socupdate.sh" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb index 8fbb22f63..2f2fd6254 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/workbook/centriq2400-rep-config.bb @@ -1,11 +1,12 @@ SUMMARY = "Qualcomm Rep board wiring" DESCRIPTION = "Board wiring information for the Qualcomm Rep system." PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit allarch inherit setuptools inherit pythonnative -inherit obmc-phosphor-license PROVIDES += "virtual/obmc-inventory-data" RPROVIDES_${PN} += "virtual-obmc-inventory-data" |