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>

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 24d4771..65119a7 100644 (file)
--- 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 5eb16b9..2ca7e12 100644 (file)
--- 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 befb544..1309ffa 100644 (file)
--- 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"