systemd: Install canbus network script in nonarch_base_libdir 77/22977/2
authorMax Tomago <max.tomago@codethink.co.uk>
Tue, 5 Nov 2019 18:47:31 +0000 (18:47 +0000)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tue, 26 Nov 2019 17:07:16 +0000 (17:07 +0000)
This is the directory where systemd keeps network scripts (e.g /lib
rather than /lib64). Installing them in base_libdir breaks the build for
multilib targets.

Bug-AGL: SPEC-2966

Change-Id: If1f780a8cfed29f22f46b9ff1d08f36dee3296ee
Signed-off-by: Max Tomago <max.tomago@codethink.co.uk>
(cherry picked from commit 2ed82aa378099d18db268c146d9a53756c5f2890)

meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend

index 8c7da43..2d14273 100644 (file)
@@ -16,7 +16,7 @@ do_install_append() {
     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
+    install -m 0644 ${WORKDIR}/canbus-can.network ${D}${nonarch_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