summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-04-13 02:57:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-13 23:57:37 +0100
commitbf867019c33c34dc997e10a3bdba4aeee81f559a (patch)
tree115139a631a1e39b4a70df9da87c68cf83e6a93b
parent3c432e130b47461f845e1618b565f174417e1aa5 (diff)
downloadopenembedded-core-contrib-bf867019c33c34dc997e10a3bdba4aeee81f559a.tar.gz
openembedded-core-contrib-bf867019c33c34dc997e10a3bdba4aeee81f559a.tar.bz2
openembedded-core-contrib-bf867019c33c34dc997e10a3bdba4aeee81f559a.zip
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] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
}