summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-03-23 06:41:04 +0000
committerRobert Yang <liezhi.yang@windriver.com>2017-03-28 03:07:03 +0000
commit359fd56d38e87dc4675f8c228dbcec76a66da74a (patch)
treed913369998178f9e4f07d42b75530acd7afa5052
parent9c948d3de08f158387e08a17cdc0cedc7d26bb54 (diff)
downloadopenembedded-core-contrib-rbt/apt.tar.gz
openembedded-core-contrib-rbt/apt.tar.bz2
openembedded-core-contrib-rbt/apt.zip
apt: fix libdir path for apt.systemd.dailyrbt/apt
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>
-rw-r--r--meta/recipes-devtools/apt/apt-package.inc4
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 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
}