meta-phosphor: master refresh d71a48b236..f05db6a860

Update meta-phosphor to master HEAD.

Patrick Venture (6):
      meta-phosphor: mrw-api-native: set LICENSE field
      meta-phosphor: obmc-inventory: set LICENSE field
      meta-phosphor: mrw-perl-tools-native: set LICENSE field
      meta-phosphor: mrw-patch-native: set LICENSE field
      meta-phosphor: obmc-phosphor-fand: set LICENSE field
      meta-phosphor: obmc-phosphor-chassisd: set LICENSE field

Change-Id: Ife52c4042abb732dd6511f20645837a844716e25
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

6 files changed, 12 insertions, 4 deletions

diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
index b02787e54..fb56db251 100644
--- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
@@ -1,6 +1,8 @@
 SUMMARY = "Phosphor OpenBMC Chassis Management"
 DESCRIPTION = "Phosphor OpenBMC chassis management reference implementation."
 PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
 inherit obmc-phosphor-pydbus-service
 
diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb b/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb
index 6faab00a2..70028af07 100644
--- a/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb
+++ b/meta-phosphor/recipes-phosphor/fans/obmc-phosphor-fand.bb
@@ -1,6 +1,8 @@
 SUMMARY = "Phosphor OpenBMC Fan Management."
 DESCRIPTION = "Phosphor OpenBMC fan management reference implementation."
 PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
 inherit pkgconfig
 inherit obmc-phosphor-sdbus-service
diff --git a/meta-phosphor/recipes-phosphor/inventory/obmc-inventory_git.bb b/meta-phosphor/recipes-phosphor/inventory/obmc-inventory_git.bb
index 71d1a25df..56286123e 100644
--- a/meta-phosphor/recipes-phosphor/inventory/obmc-inventory_git.bb
+++ b/meta-phosphor/recipes-phosphor/inventory/obmc-inventory_git.bb
@@ -2,6 +2,8 @@ SUMMARY = "Phosphor Inventory Generation"
 DESCRIPTION = "Generates inventory data from the machine readable workbook"
 PR = "r1"
 PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 inherit mrw-xml
 
@@ -11,7 +13,6 @@ PROVIDES += "virtual/obmc-inventory-data"
 RPROVIDES_${PN} += "virtual-obmc-inventory-data"
 
 inherit allarch
-inherit obmc-phosphor-license
 inherit mrw-rev
 
 DEPENDS += "mrw-native mrw-api-native"
diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
index 1930388ed..b08db6930 100644
--- a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb
@@ -1,10 +1,11 @@
 SUMMARY = "Phosphor OpenBMC machine readable workbook API modules"
 DESCRIPTION = "The API for the MRW XML generated by the Serverwiz tool"
 PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d2794c0df5b907fdace235a619d80314"
 
 S = "${WORKDIR}/scripts"
 
-inherit obmc-phosphor-license
 inherit native
 inherit perlnative
 inherit cpan-base
diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb
index 9ff3b8dd2..11544f9d1 100644
--- a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb
@@ -2,10 +2,11 @@ SUMMARY = "Phosphor machine readable workbook patching script"
 DESCRIPTION = "Retrieve the script that can patch the MRW XML"
 PR = "r1"
 PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 S = "${WORKDIR}/git"
 
-inherit obmc-phosphor-license
 inherit native
 inherit mrw-rev
 
diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb
index eb7f0bf16..0d79e39ee 100644
--- a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb
@@ -2,9 +2,10 @@ SUMMARY = "OpenBMC MRW Perl Tools"
 DESCRIPTION = "OpenBMC Perl tools for the machine readable workbook"
 PR = "r1"
 PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 S = "${WORKDIR}/git"
 
-inherit obmc-phosphor-license
 inherit native
 inherit cpan_build
 inherit mrw-rev