From c3a3b64604d8e7dfffc90daebc64eb8f654fa6e1 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 13 Sep 2019 14:02:27 -0400
Subject: meta-qualcomm: Remove references to QUALCOMMBASE

QUALCOMMBASE 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-qualcomm rev: b6305a99ca1f9c5f5ba88f1aeaf3e01a61c2f3fa)

Change-Id: Ia1a8e95f4a09743538f427055294fd84dd3169c4
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-qualcomm/conf/layer.conf                                          | 3 ---
 .../recipes-phosphor/chassis/ir38163-workaround.bb                     | 2 +-
 .../recipes-phosphor/console/centriq-2400rep-console-client.bb         | 2 +-
 .../recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb | 2 +-
 .../meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb       | 2 +-
 .../recipes-phosphor/workbook/centriq2400-rep-config.bb                | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index 51c563e86..5079054e3 100644
--- a/meta-qualcomm/conf/layer.conf
+++ b/meta-qualcomm/conf/layer.conf
@@ -3,6 +3,3 @@ 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 c7169a999..fb9a728e3 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
@@ -2,7 +2,7 @@ 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"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit obmc-phosphor-systemd
 
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 eb7ed1f78..929a11a5f 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,6 +1,6 @@
 FILESEXTRAPATHS_prepend_centriq2400-rep := "${THISDIR}/${PN}:"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 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 6e4d51744..d43aee8bf 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,7 +1,7 @@
 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"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit 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 16b11a346..9c4a0bd7e 100644
--- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb
+++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/socupdate/socupdate.bb
@@ -3,7 +3,7 @@ DESCRIPTION = ""
 HOMEPAGE = ""
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUALCOMMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 
 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 2f2fd6254..220adaca4 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
@@ -2,7 +2,7 @@ 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"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 inherit setuptools
-- 
cgit v1.2.3