]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
apt: fix libdir path for apt.systemd.daily rbt/apt
authorRobert Yang <liezhi.yang@windriver.com>
Thu, 23 Mar 2017 06:41:04 +0000 (06:41 +0000)
committerRobert Yang <liezhi.yang@windriver.com>
Tue, 28 Mar 2017 03:07:03 +0000 (03:07 +0000)
It should be ${libdir} rather than /usr/lib, otherwise it would fail
when multilib (installed-vs-shipped).

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
meta/recipes-devtools/apt/apt-package.inc

index 839d58e2f78e26349396a1af8c12ab0dc39506ad..6a01f99c63f7b43646123c1c20a74cb709c467ca 100644 (file)
@@ -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
 }