meta-quanta: master refresh bfbdc52828..a20f4c0ddd
Update meta-quanta to master HEAD.
Patrick Venture (6):
meta-quanta: q71l: ipmi-channel-config-native: set LICENSE field
meta-quanta: q71l: ipmi-fru-merge-config-native: set LICENSE field
meta-quanta: q71l: ipmi-inventory-map-native: set LICENSE field
meta-quanta: q71l: ipmi-sensor-map-native: set LICENSE field
meta-quanta: q71l: quanta-powerctrl: set LICENSE field
meta-quanta: q71l: quanta-q71l-config: set LICENSE field
Change-Id: I3cdd9be9868335a9224130ef316ad46606c4d7ec
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb
index 6eae845..215683b 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb
+++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb
@@ -1,9 +1,10 @@
SUMMARY = "Quanta Q71l IPMI Channel to if_name mapping."
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-ipmi-channel-config"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb
index 330cda1..83bf5c2 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb
+++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb
@@ -1,5 +1,7 @@
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
inherit native
-inherit obmc-phosphor-license
DEPENDS += "virtual/phosphor-ipmi-fru-inventory"
PROVIDES += "virtual/phosphor-ipmi-fru-merge-config"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb
index 93706f3..dbb5917 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb
+++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-inventory-map-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "Quanta-Q71l IPMI to DBus Inventory mapping."
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
-inherit obmc-phosphor-license
inherit phosphor-ipmi-fru
SRC_URI += "file://config.yaml"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb
index 951a55f..07c53e4 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb
+++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-sensor-map-native.bb
@@ -1,9 +1,10 @@
SUMMARY = "Quanta Q71l IPMI to DBus Sensor mapping."
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit phosphor-ipmi-host
-inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-ipmi-sensor-inventory"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb
index fd02327..940b72d 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb
+++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb
@@ -1,7 +1,8 @@
FILESEXTRAPATHS_append := "${THISDIR}/files:"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit systemd
-inherit obmc-phosphor-license
inherit obmc-phosphor-systemd
S = "${WORKDIR}/"
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb b/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb
index 647633f..e15bbd9 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb
+++ b/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb
@@ -1,11 +1,12 @@
SUMMARY = "Quanta Q71l board wiring"
DESCRIPTION = "Board wiring information for the Quanta Q71l system."
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${QUANTABASE}/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"