summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-agl-profile-core/recipes-core/systemd/systemd/canbus-can.network (renamed from meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network)0
-rw-r--r--meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend4
-rw-r--r--meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend8
3 files changed, 4 insertions, 8 deletions
diff --git a/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network b/meta-agl-profile-core/recipes-core/systemd/systemd/canbus-can.network
index 9768c4bf9..9768c4bf9 100644
--- a/meta-agl-profile-telematics/recipes-core/systemd/files/canbus-can.network
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd/canbus-can.network
diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
index 815fed8a3..8c7da4390 100644
--- a/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend
@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "\
file://e2fsck.conf \
+ file://canbus-can.network \
${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','file://wired.network','',d)} \
"
@@ -14,6 +15,9 @@ do_install_append() {
# Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time
install -m 644 -p -D ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf
+ # Install canbus network script
+ install -m 0644 ${WORKDIR}/canbus-can.network ${D}${base_libdir}/systemd/network/60-canbus-can.network
+
if ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','true','false',d)}; then
# Install DHCP configuration for Ethernet adapters
install -m 644 ${WORKDIR}/wired.network ${D}${sysconfdir}/systemd/network
diff --git a/meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend b/meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index 5e02b2b24..000000000
--- a/meta-agl-profile-telematics/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-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
-}