summaryrefslogtreecommitdiff
path: root/meta-ingrasys
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-09-13 21:08:31 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-09-18 23:50:29 +0300
commita242d47bb8b3d35c1eef196404db8b219070c264 (patch)
treefb8c7cf4751bb5bbf74d5d9303c283f97af9bca7 /meta-ingrasys
parentd77088a92b6f2bbcca68eb673a80db3863530b2c (diff)
downloadopenbmc-a242d47bb8b3d35c1eef196404db8b219070c264.tar.xz
meta-ingrasys: Remove references to INGRASYSBASE
INGRASYSBASE 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-ingrasys rev: fcd2b2998a76f00307bb2ff821efa8ff8ef87c68) Change-Id: I76d73574778db36a649f20ccc0a5149f616743af Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ingrasys')
-rw-r--r--meta-ingrasys/conf/layer.conf3
-rw-r--r--meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb2
-rw-r--r--meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb2
-rw-r--r--meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb2
4 files changed, 3 insertions, 6 deletions
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 8d0b76be0..064875063 100644
--- a/meta-ingrasys/conf/layer.conf
+++ b/meta-ingrasys/conf/layer.conf
@@ -4,6 +4,3 @@ BBPATH .= ":${LAYERDIR}"
BBFILE_COLLECTIONS += "ingrasys"
BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/"
LAYERSERIES_COMPAT_ingrasys = "thud warrior"
-
-# Provide a variable that points the base of the ingrasys layer.
-INGRASYSBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
index 164a9e75b..dd6d6eec0 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
@@ -2,7 +2,7 @@ SUMMARY = "Zaius AVSBus control"
DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Zaius"
PR = "r0"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/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-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
index f33fe0dc2..597dff4ba 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
@@ -2,7 +2,7 @@ SUMMARY = "Zaius VCS rail control"
DESCRIPTION = "VCS voltage rail control implementation for Zaius"
PR = "r0"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/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-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
index 98dbc15b2..129938f37 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb
@@ -1,7 +1,7 @@
SUMMARY = "YAML configuration for Zaius"
PR = "r1"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
inherit allarch