From 697f17de7a71b3dd9a6a0f37a2394b5525970c1c Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 13 Sep 2019 14:07:33 -0400
Subject: meta-inspur: Remove references to INSPURBASE

INSPURBASE is only used for pointing at licenses...point at the
licenses in oe-core in meta/files/common-licenses instead. to match the
defacto convention used in other oe layers like meta-openembedded.

(From meta-inspur rev: 052786ad38fa172500a9f641ed26e95e25e6fbc6)

Change-Id: I5394fc045042a30bdc958a6e528d9a7f947d49b9
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-inspur/conf/layer.conf                                             | 2 --
 .../recipes-phosphor/configuration/fp5280g2-yaml-config.bb              | 2 +-
 .../recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb          | 2 +-
 .../recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb     | 2 +-
 .../recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb    | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf
index 3ba10679e..bdec1db47 100644
--- a/meta-inspur/conf/layer.conf
+++ b/meta-inspur/conf/layer.conf
@@ -8,5 +8,3 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "inspur-layer"
 BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/"
 LAYERSERIES_COMPAT_inspur-layer = "thud warrior"
-
-INSPURBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
index 147f30988..c10330b9b 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
@@ -1,7 +1,7 @@
 SUMMARY = "YAML configuration for FP5280G2"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb
index ba31df378..4cf267794 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Fp5280g2 OCC Control sensor IDs"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-occ-control
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb
index 915af76c7..f731bfe54 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Inspur FP5280G2 Inventory config for openpower-vpd-parser"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-fru-vpd
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb
index 46611fa55..ba684fb88 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Inspur FP5280G2 VPD layout for openpower-fru-vpd"
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit native
 inherit openpower-fru-vpd
-- 
cgit v1.2.3