Add can-dev-mapping-helperjellyfish_9.99.3jellyfish/9.99.39.99.3

Changes:
- Add a can-dev-mapping-helper.sh script and systemd unit to drive
  it, the script checks if the CAN devices specified in the low-can
  configuration file /etc/dev-mapping.conf exist, and if not brings
  up corresponding virtual CAN devices.
- Add a systemd over-ride conf file for agl-service-can-low-level
  that makes can-dev-mapping-helper a dependency. This should ensure
  that the low-can binding always starts even if there are no physical
  CAN hardware devices.
- Added a Before statement to sllin-demo.service to ensure that it
  will run before can-dev-mapping-helper and ensure that lin_config
  can create sllin0 correctly.
- Removed the sllin-demo-virtual systemd unit, as it will no longer
  be required with can-dev-mapping-helper.
- Updated the /var/run paths in sllin-demo.service and associated
  start_lin_demo.sh script to quiet systemd warnings about /var/run
  usage.

Bug-AGL: SPEC-3540

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

4 files changed, 4 insertions, 21 deletions

diff --git a/recipes-kernel/sllin/files/sllin-demo-virtual.service b/recipes-kernel/sllin/files/sllin-demo-virtual.service
deleted file mode 100644
index 788242197..000000000
--- a/recipes-kernel/sllin/files/sllin-demo-virtual.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=LIN demo configuration (virtual)
-ConditionPathExists=!/dev/ttyUSB0
-After=afm-system-daemon.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/start_lin_demo.sh
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-kernel/sllin/files/sllin-demo.service b/recipes-kernel/sllin/files/sllin-demo.service
index 2f2f5ac23..e3e7432f3 100644
--- a/recipes-kernel/sllin/files/sllin-demo.service
+++ b/recipes-kernel/sllin/files/sllin-demo.service
@@ -2,10 +2,11 @@
 Description=LIN demo configuration
 ConditionPathExists=/dev/ttyUSB0
 After=afm-system-daemon.service
+Before=can-dev-mapping-helper.service
  
 [Service]
 Type=forking
-PIDFile=/var/run/lin_config.pid
+PIDFile=/run/lin_config/lin_config.pid
 ExecStart=/usr/bin/start_lin_demo.sh
 RemainAfterExit=yes
  
diff --git a/recipes-kernel/sllin/files/start_lin_demo.sh b/recipes-kernel/sllin/files/start_lin_demo.sh
index 26f64c0a1..c7627ca74 100755
--- a/recipes-kernel/sllin/files/start_lin_demo.sh
+++ b/recipes-kernel/sllin/files/start_lin_demo.sh
@@ -4,7 +4,8 @@
 if [ -c /dev/ttyUSB0 ]; then
     sleep 1
     /usr/bin/lin_config -c /etc/lin_config.conf -a sllin:/dev/ttyUSB0
-    pidof lin_config > /var/run/lin_config.pid
+    mkdir -p /run/lin_config/
+    pidof lin_config > /run/lin_config/lin_config.pid
     sleep 1
 else
     ip link add dev sllin0 type vcan
diff --git a/recipes-kernel/sllin/sllin.bb b/recipes-kernel/sllin/sllin.bb
index 7c4313f16..0478b21a7 100644
--- a/recipes-kernel/sllin/sllin.bb
+++ b/recipes-kernel/sllin/sllin.bb
@@ -18,7 +18,6 @@ SRC_URI_append = " \
 	file://0003-Allow-recent-kernels-newer-4.11.x-to-build.patch;pnum=2 \
 	file://0001-Disable-sllin-driver-debug-log.patch;pnum=2 \
 	file://sllin-demo.service \
-	file://sllin-demo-virtual.service \
 	file://start_lin_demo.sh \
 	file://lin_config.conf \
 "
@@ -30,22 +29,16 @@ SLLINBAUDRATE ??= "9600"
 module_conf_sllin = "options sllin baudrate=${SLLINBAUDRATE}"
 
 SYSTEMD_SERVICE_${PN} = "sllin-demo.service"
-SYSTEMD_SERVICE_${PN}-virtual = "sllin-demo-virtual.service"
 
 do_install_append () {
 	install -d 644 ${D}/${bindir}
 	install -m 755 ${WORKDIR}/start_lin_demo.sh ${D}/${bindir}/start_lin_demo.sh
 	install -d ${D}${systemd_system_unitdir}
 	install -m 0644 ${WORKDIR}/sllin-demo.service ${D}${systemd_system_unitdir}/
-	install -m 0644 ${WORKDIR}/sllin-demo-virtual.service ${D}${systemd_system_unitdir}/
 	install -d ${D}${sysconfdir}
 	install -m 0644 ${WORKDIR}/lin_config.conf ${D}${sysconfdir}/
 }
 
-PACKAGES =+ "${PN}-virtual"
-
 FILES_${PN} += "${bindir}/start_lin_demo.sh ${sysconfdir}/lin_config.conf"
 
-FILES_${PN}-virtual = "${systemd_system_unitdir}/sllin-demo-virtual.service"
-
 RDEPENDS_${PN} += "lin-config"