[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5668/8267] apt: fix libdir path for apt.systemd.daily

[Emmanuele Bassi <ebassi src gnome org>]

commit 7b4a8a2fb8dd4567c216c2bc00db2a89b7ff350d
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Apr 13 02:57:24 2017 -0700

    apt: fix libdir path for apt.systemd.daily
    
    It should be ${libdir} rather than /usr/lib, otherwise it would fail
    when multilib:
    
    MACHINE = "qemux86-64"
    require conf/multilib.conf
    MULTILIBS = "multilib:lib32"
    DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
    
    $ bitbake apt
    [snip]
    install: target /path/to/apt/1.2.12-r0/image/usr/lib/apt is not a directory: No such file or directory
    [snip]
    
    (From OE-Core rev: bf867019c33c34dc997e10a3bdba4aeee81f559a)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/apt/apt-package.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index 839d58e..6a01f99 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -83,9 +83,11 @@ do_install () {
        install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/
 
        install -d ${D}${systemd_unitdir}/system/
-       install -m 0644 ${S}/debian/apt.systemd.daily ${D}/usr/lib/apt/
+       install -m 0644 ${S}/debian/apt.systemd.daily ${D}${libdir}/apt/
        install -m 0644 ${S}/debian/apt-daily.service ${D}${systemd_unitdir}/system/
+       sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${systemd_unitdir}/system/apt-daily.service
        install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/
        install -d ${D}${sysconfdir}/cron.daily/
        install -m 0755 ${S}/debian/apt.apt-compat.cron.daily ${D}${sysconfdir}/cron.daily/
+       sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${sysconfdir}/cron.daily/apt.apt-compat.cron.daily
 }