diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-13 21:10:25 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-18 23:50:54 +0300 |
commit | f5f8a281e48c12a88dd6522b9b647099afc2d86d (patch) | |
tree | 030e97d4c9cdced5451d7f54f1950a2340d54fef | |
parent | c3a3b64604d8e7dfffc90daebc64eb8f654fa6e1 (diff) | |
download | openbmc-f5f8a281e48c12a88dd6522b9b647099afc2d86d.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
4 files changed, 3 insertions, 6 deletions
diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf index ec6913af2d..bc33c2b24a 100644 --- 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/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb index 879f7a520b..a0194c81b2 100644 --- a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb +++ b/meta-hxt/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 index e2ae60afbf..66a0755513 100644 --- 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 index de5f7ae4f4..ec8f0de131 100644 --- 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 |