Add dev-mapping-ci recipe

Add a dev-mapping-ci recipe that installs a CI specific version of
/etc/dev-mapping.conf for the agl-service-can-low-level binding.
Additionally, the dev-mapping-demo recipe files have been moved to
recipes-config/dev-mapping so all the dev-mapping* recipes are in
the same place, and the now required "j1939" bus mapping has been
added to the various dev-mapping files.

To enable use of the new recipe, a definition of the variable
PREFERRED_RPROVIDER_virtual/low-can-dev-mapping has been added to
the agl-demo feature definition that enables it based on the AGLCI
DISTRO_FEATURE.  This is intended to replace the definition in
poky-agl.conf, which will be removed in subsequent cleanup.

Bug-AGL: SPEC-3756

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ieb80a7f4b76ddd7851acca521dea1a8dd104cf86

5 files changed, 27 insertions, 0 deletions

diff --git a/recipes-config/dev-mapping/dev-mapping-ci/dev-mapping.conf.ci b/recipes-config/dev-mapping/dev-mapping-ci/dev-mapping.conf.ci
new file mode 100644
index 000000000..bd5c2135a
--- /dev/null
+++ b/recipes-config/dev-mapping/dev-mapping-ci/dev-mapping.conf.ci
@@ -0,0 +1,7 @@
+; Default CAN device mapping
+; Format has to follow ini rules key="value", notice " around value.
+
+[CANbus-mapping]
+hs="vcan0"
+ls="vcan0"
+j1939="vcan0"
diff --git a/recipes-config/dev-mapping/dev-mapping-ci_1.0.bb b/recipes-config/dev-mapping/dev-mapping-ci_1.0.bb
new file mode 100644
index 000000000..cbba57308
--- /dev/null
+++ b/recipes-config/dev-mapping/dev-mapping-ci_1.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "AGL demo device mapping configuration file"
+DESCRIPTION = "This provides a default dev-mapping.conf file \
+ that defines mapping between kernel device and logical name \
+ used in the low-can binding for the AGL CI setup."
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI += "file://dev-mapping.conf.ci"
+
+inherit allarch
+
+do_install() {
+    install -d ${D}${sysconfdir}
+    install -m 0644 ${WORKDIR}/dev-mapping.conf.ci ${D}${sysconfdir}/dev-mapping.conf
+}
+
+RPROVIDES_${PN} = "virtual/low-can-dev-mapping"
diff --git a/recipes-config/dev-mapping-demo/dev-mapping-demo/dev-mapping.conf.demo b/recipes-config/dev-mapping/dev-mapping-demo/dev-mapping.conf.demo
index 93b0a020b..1fd12ad03 100644
--- a/recipes-config/dev-mapping-demo/dev-mapping-demo/dev-mapping.conf.demo
+++ b/recipes-config/dev-mapping/dev-mapping-demo/dev-mapping.conf.demo
@@ -4,3 +4,4 @@
 [CANbus-mapping]
 hs="can0"
 ls="sllin0"
+j1939="can0"
diff --git a/recipes-config/dev-mapping-demo/dev-mapping-demo_1.0.bb b/recipes-config/dev-mapping/dev-mapping-demo_1.0.bb
index 4a04ce13b..4a04ce13b 100644
--- a/recipes-config/dev-mapping-demo/dev-mapping-demo_1.0.bb
+++ b/recipes-config/dev-mapping/dev-mapping-demo_1.0.bb
diff --git a/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default b/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default
index 7bd8bf2eb..8519a5873 100644
--- a/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default
+++ b/recipes-config/dev-mapping/dev-mapping/dev-mapping.conf.default
@@ -4,3 +4,4 @@
 [CANbus-mapping]
 hs="can0"
 ls="can0"
+j1939="can0"