meta-hxt: Remove references to HXTBASE

HXTBASE 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-hxt rev: 9a75e608b2bba938d1e25e8d752dc50cab17aebf) Change-Id: I6b6a0943ecb467a1ab5c205d43d9295f5deee62c Signed-off-by: Brad Bishop <[email protected]>
pjcheninventec · Sep 18, 2019 · f5f8a28 · f5f8a28
1 parent c3a3b64
commit f5f8a28
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf
@@ -3,6 +3,3 @@ BBPATH .= ":${LAYERDIR}"
 
 BBFILE_COLLECTIONS += "hxt"
 BBFILE_PATTERN_hxt = ""
-
-# Provide a variable that points the base of the hxt layer.
-HXTBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/...t/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb b/...t/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend_stardragon4800-rep2 := "${THISDIR}/${PN}:"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 SRC_URI += "file://stardragon4800-rep2-console-client.sh"
 

diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "A sample script to help update the host(soc) firmware"
 HOMEPAGE = ""
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${HXTBASE}/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-hxt/meta-stardragon4800-rep2/recipes-phosphor/workbook/stardragon4800-rep2-config.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/workbook/stardragon4800-rep2-config.bb
@@ -2,7 +2,7 @@ SUMMARY = "HXT Rep board wiring"
 DESCRIPTION = "Board wiring information for the HXT Rep system."
 PR = "r1"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 inherit allarch
 inherit setuptools