meta-agl-profile-telematics: recipes-core: systemd: change canbus systemd match regex

Match on can* versus only can0 for any canbus interfaces that are detected
and set to 500K (which is a common standard automotive baud rate).

Change-Id: I8fe00c3043a7fa1faf92506a6cc26bd692ef3aa0
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>

diff --git a/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can0.network b/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network
similarity index 73%
rename from meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can0.network
rename to meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network
index 8e548ce..9768c4b 100644 (file)
--- a/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can0.network
+++ b/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network
@@ -1,5 +1,5 @@
 [Match]
-Name=can0
+Name=can*
 
 [CAN]
 BitRate=500K

diff --git a/meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend b/meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend
new file mode 100644 (file)
index 0000000..5e02b2b
--- /dev/null
+++ b/meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = "file://canbus-can.network"
+
+do_install_append() {
+    mkdir -p ${D}${base_libdir}/systemd/network
+    install -m 0644 ${WORKDIR}/canbus-can.network ${D}${base_libdir}/systemd/network/60-canbus-can.network
+}

diff --git a/meta-agl-profile-telematics/recipes-core/systemd/systemd_234.bbappend b/meta-agl-profile-telematics/recipes-core/systemd/systemd_234.bbappend
index a145cc9..7c49231 100644 (file)
--- a/meta-agl-profile-telematics/recipes-core/systemd/systemd_234.bbappend
+++ b/meta-agl-profile-telematics/recipes-core/systemd/systemd_234.bbappend
@@ -4,10 +4,4 @@ SRC_URI_append = " \
     file://0001-networkd-link-link_configure-factor-out-link_configu.patch \
     file://0002-networkd-link-link_up_can-move-function-upwards.patch \
     file://0003-networkd-link-add-support-to-configure-CAN-interface.patch \
-    file://canbus-can0.network \
 "
-
-do_install_append() {
-    mkdir -p ${D}${base_libdir}/systemd/network
-    install -m 0644 ${WORKDIR}/canbus-can0.network ${D}${base_libdir}/systemd/network/60-canbus-can0.network
-}