From f559f725c4fbd3135e407c23231d93d07d2ab9ee Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 14:06:22 -0400 Subject: meta-intel: Remove references to INTELBASE INTELBASE 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-intel rev: bbf062e439732ac0a9e62bdc02e7baab0967cae4) Change-Id: Ief59bb83ab71946dab61c04db7781ff9fd1b6e17 Signed-off-by: Brad Bishop --- meta-intel/conf/layer.conf | 3 --- .../dbus/intel-dbus-interfaces-mapper-config-native.bb | 2 +- .../recipes-phosphor/leds/intel-led-manager-config-native.bb | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'meta-intel') diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index 99a6df0618..6605799aeb 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -9,6 +9,3 @@ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "" LAYERVERSION_intel = "1" LAYERSERIES_COMPAT_intel = "thud warrior" - -# Provide a variable that points the base of the intel layer. -INTELBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb index ce95082ce7..0d1d016fea 100644 --- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb +++ b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb @@ -2,7 +2,7 @@ SUMMARY="Add /com/intel namespace to phosphor-mapper" DESCRIPTION="Add the /com/intel path namespace and \ com.intel interface prefix to the mapper watch list." LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit phosphor-mapper inherit native diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb index 8ef3a5dfa9..20df1185b4 100644 --- a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb +++ b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb @@ -5,7 +5,7 @@ inherit native inherit obmc-phosphor-utils LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" PROVIDES += "virtual/phosphor-led-manager-config-native" -- cgit v1.2.3