From 7ec1d679d1961f22e47bcec8d7e79101edd6a131 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 14:04:55 -0400 Subject: meta-inventec: Remove references to INVENTECBASE INVENTECBASE 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-inventec rev: 87316ecf8bbbf9471b961ec3b0185888f983237e) Change-Id: I1f8f24a1eac6966419f9424216ee2a24fc940f6b Signed-off-by: Brad Bishop --- meta-inventec/conf/layer.conf | 3 --- meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb | 2 +- .../recipes-phosphor/ipmi/lanyang-ipmi-inventory-map-native.bb | 2 +- .../recipes-phosphor/leds/lanyang-led-manager-config-native.bb | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) (limited to 'meta-inventec') diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf index 3c284f8ce..de22db1e3 100644 --- a/meta-inventec/conf/layer.conf +++ b/meta-inventec/conf/layer.conf @@ -3,6 +3,3 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "inventec" BBFILE_PATTERN_inventec = "" - -# Provide a variable that points the base of the inventec layer. -INVENTECBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb index 767da632e..956a62377 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb @@ -2,7 +2,7 @@ SUMMARY = "Lanyang AVSBus control" DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Lanyang" PR = "r0" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INVENTECBASE}/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-inventec/meta-lanyang/recipes-phosphor/ipmi/lanyang-ipmi-inventory-map-native.bb b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/lanyang-ipmi-inventory-map-native.bb index b74f8f67d..56e5dd259 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/lanyang-ipmi-inventory-map-native.bb +++ b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/lanyang-ipmi-inventory-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Lanyang IPMI to DBus Inventory mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INVENTECBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-fru diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb b/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb index b4e056065..81c6731d8 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb +++ b/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Phosphor LED Group Management for Lanyang" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INVENTECBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native -- cgit v1.2.3