[PATCH 0/1 V2] apt: fix libdir path for apt.systemd.daily

[PATCH 0/1 V2] apt: fix libdir path for apt.systemd.daily

[Robert Yang]

* V2
  Also fix apt-daily.service and apt.apt-compat.cron.daily as Ross commented.

// Robert

The following changes since commit 9c948d3de08f158387e08a17cdc0cedc7d26bb54:

  oeqa/selftest: don't use cleanall in selftests (2017-03-27 20:22:43 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/apt
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/apt

Robert Yang (1):
  apt: fix libdir path for apt.systemd.daily

 meta/recipes-devtools/apt/apt-package.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.11.0.rc2.dirty

[PATCH 1/1] apt: fix libdir path for apt.systemd.daily

[Robert Yang]

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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index 839d58e2f7..6a01f99c63 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
 }
-- 
2.11.0.rc2.dirty