From a242d47bb8b3d35c1eef196404db8b219070c264 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 14:08:31 -0400 Subject: 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 --- meta-ingrasys/conf/layer.conf | 3 --- meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb | 2 +- meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb | 2 +- .../meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) (limited to 'meta-ingrasys') diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index 8d0b76be0d..064875063b 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 164a9e75b4..dd6d6eec0e 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 f33fe0dc28..597dff4bae 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 98dbc15b29..129938f377 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 -- cgit v1.2.3