From dd21af780072b16bd27814a5cd347431b3baffdc Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Wed, 27 Mar 2019 06:28:53 +0200 Subject: 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 --- .../recipes-core/systemd/files/canbus-can.network | 5 +++++ .../recipes-core/systemd/files/canbus-can0.network | 5 ----- .../recipes-core/systemd/systemd_%.bbappend | 8 ++++++++ .../recipes-core/systemd/systemd_234.bbappend | 6 ------ 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network delete mode 100644 meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can0.network create mode 100644 meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend diff --git a/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network b/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network new file mode 100644 index 000000000..9768c4bf9 --- /dev/null +++ b/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network @@ -0,0 +1,5 @@ +[Match] +Name=can* + +[CAN] +BitRate=500K diff --git a/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can0.network b/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can0.network deleted file mode 100644 index 8e548ce59..000000000 --- a/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can0.network +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Name=can0 - -[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 index 000000000..5e02b2b24 --- /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 a145cc98b..7c49231b2 100644 --- 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 -} -- cgit 1.2.3-korg