meta-opnepower: master refresh e9a2e1a2d8..39ab114ed6
Update meta-openpower to master HEAD.
Patrick Venture (5):
meta-openpower: vpd: fru-inventory-mrw-native: set LICENSE field
meta-openpower: vpd: fru-properties-example-native: set LICENSE field
meta-openpower: vpd: fru-properties-mrw-native: set LICENSE field
meta-openpower: vpd: fru-vpd-layout-native: set LICENSE field
meta-openpower: ipmi-oem-whitelist-native: update LICENSE field
Change-Id: I74959fd078a397701be44380721a420329552716
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb
index f8f73aa..4ca07078 100644
--- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb
+++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb
@@ -1,7 +1,7 @@
SUMMARY = "Whitelisted OpenBMC IPMI OEM commands"
DESCRIPTION = "Whitelisted OpenBMC IPMI OEM commands for OpenPOWER based systems"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit phosphor-ipmi-host-whitelist
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb
index 6eb76ac..12e9f27 100644
--- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb
+++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-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
inherit mrw-xml
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb
index 7ed83b3..c398cc8 100644
--- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb
+++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "FRU properties 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://example.yaml"
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb
index 2dc5820..0e32a42 100644
--- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb
+++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb
@@ -1,8 +1,9 @@
SUMMARY = "FRU properties 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
inherit mrw-xml
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb
index de0cc64..e0717e3 100644
--- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb
+++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb
@@ -1,9 +1,10 @@
SUMMARY = "VPD layout for openpower-fru-vpd"
PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
inherit native
inherit openpower-fru-vpd
-inherit obmc-phosphor-license
SRC_URI += "file://layout.yaml"