diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-13 21:04:55 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-16 14:41:25 +0300 |
commit | 7ec1d679d1961f22e47bcec8d7e79101edd6a131 (patch) | |
tree | 1ff4d9829bd8a3a0441dd1c42b8c696289ea5474 | |
parent | 59de630725b55a99f8c0f9d823b6987decaa27a5 (diff) | |
download | openbmc-7ec1d679d1961f22e47bcec8d7e79101edd6a131.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
4 files changed, 3 insertions, 6 deletions
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf index 3c284f8ce1..de22db1e3b 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 767da632ef..956a623772 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 b74f8f67d4..56e5dd2591 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 b4e056065f..81c6731d84 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 |