From 136ad773f3799a28d3e96cc01c2555357bb44676 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 13:59:59 -0400 Subject: meta-yadro: Remove references to YADROBASE YADROBASE 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-yadro rev: 55fa5d541e0cb4291c46213132b479e6d16e8360) Change-Id: I8388c5e60837f7ae0d81be4b6cab82db71d43709 Signed-off-by: Brad Bishop --- meta-yadro/conf/layer.conf | 3 --- meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb | 2 +- .../meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb | 2 +- .../recipes-phosphor/occ/nicole-occ-control-config-native.bb | 2 +- .../meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb | 2 +- .../recipes-phosphor/leds/vesnin-led-manager-config-native.bb | 2 +- .../recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) (limited to 'meta-yadro') diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf index 7feac4c212..58ac541cbf 100644 --- a/meta-yadro/conf/layer.conf +++ b/meta-yadro/conf/layer.conf @@ -6,6 +6,3 @@ BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1" LAYERSERIES_COMPAT_yadro-layer = "thud warrior" - -# Provide a variable that points the base of the yadro layer. -YADROBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb index 854795be38..1865e61e83 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb @@ -1,7 +1,7 @@ SUMMARY = "Nicole AVSBus control" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/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-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb index 4f77d85cb8..26cad61da0 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb @@ -1,7 +1,7 @@ SUMMARY = "YAML configuration for Nicole" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch diff --git a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb index 8d959e7ff3..83deb434b3 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Nicole OCC Control sensor IDs" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-occ-control diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb index dc786e5620..94000a0a70 100644 --- a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb +++ b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb @@ -1,7 +1,7 @@ SUMMARY = "YAML configuration for Vesnin" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb index 51a2f0b075..c10301060e 100644 --- a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb +++ b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Phosphor LED Group Management for Vesnin" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit obmc-phosphor-utils diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb index 2db6c3661e..71ce60ce23 100644 --- a/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb +++ b/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Vesnin OCC Control sensor IDs" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${YADROBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-occ-control -- cgit v1.2.3