aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-12-29 18:16:54 -0500
committerScott Murray <scott.murray@konsulko.com>2019-12-29 18:16:54 -0500
commitd9f3fffe99810a1fcc2cfa0f0ae966cc0fec2136 (patch)
tree4daf06470bf5e0fca07ee7312bafc671fbf352e2
parentbb56044fafed5e610870f9da95ffba45925fbae2 (diff)
dev-mapping: Add RPROVIDES mechanism
Add RPROVIDES and PREFFERED_RPROVIDER definitions to define a new virtual/low-can-dev-mapping runtime package dependency that will enable providing a different device mapping configuration for demo setups. Bug-AGL: SPEC-3076 Change-Id: I73d253a0a1285dd4576bb3b5bf04568c3d05e60c Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--meta-agl-distro/conf/distro/poky-agl.conf3
-rw-r--r--meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb2
-rw-r--r--meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb8
3 files changed, 8 insertions, 5 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index d19be3e60..0c5803fe1 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -172,3 +172,6 @@ do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF"
# Set preferred provider to new navi application
PREFERRED_RPROVIDER_virtual/navigation ?= "ondemandnavi"
+
+# Set preferred provider for low-can device mapping configuration
+PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping"
diff --git a/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb b/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
index 5eb16b9f5..2ca7e1218 100644
--- a/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
+++ b/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
@@ -13,7 +13,7 @@ PV = "${AGLVERSION}"
S = "${WORKDIR}/git"
DEPENDS = "libafb-helpers"
-RDEPENDS_${PN} = "dev-mapping"
inherit cmake aglwgt pkgconfig ptest
+RDEPENDS_${PN} = "virtual/low-can-dev-mapping"
diff --git a/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb b/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb
index befb5443f..1309ffa20 100644
--- a/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb
+++ b/meta-agl-profile-core/recipes-config/dev-mapping/dev-mapping_0.1.bb
@@ -1,5 +1,3 @@
-inherit allarch
-
SUMMARY = "AGL Device mapping configuration file"
DESCRIPTION = "This provide default dev-mapping.conf file \
that defines mapping between kernel device and logical name \
@@ -8,11 +6,13 @@ DESCRIPTION = "This provide default dev-mapping.conf file \
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
SRC_URI += "file://dev-mapping.conf.default"
+inherit allarch
+
do_install() {
install -d ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/dev-mapping.conf.default ${D}${sysconfdir}/dev-mapping.conf
}
+
+RPROVIDES_${PN} = "virtual/low-can-dev-mapping"