diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-04-13 02:57:24 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-14 09:47:08 +0100 |
commit | 7b4a8a2fb8dd4567c216c2bc00db2a89b7ff350d (patch) | |
tree | e79a11026afbfd54c4eb8658235e409ccaac72c5 /meta/recipes-devtools | |
parent | 8cedb5f3f080b0348b796d991af7c0712d8592f6 (diff) | |
download | poky-7b4a8a2fb8dd4567c216c2bc00db2a89b7ff350d.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | 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 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 () { | |||
83 | install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ | 83 | install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ |
84 | 84 | ||
85 | install -d ${D}${systemd_unitdir}/system/ | 85 | install -d ${D}${systemd_unitdir}/system/ |
86 | install -m 0644 ${S}/debian/apt.systemd.daily ${D}/usr/lib/apt/ | 86 | install -m 0644 ${S}/debian/apt.systemd.daily ${D}${libdir}/apt/ |
87 | install -m 0644 ${S}/debian/apt-daily.service ${D}${systemd_unitdir}/system/ | 87 | install -m 0644 ${S}/debian/apt-daily.service ${D}${systemd_unitdir}/system/ |
88 | sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${systemd_unitdir}/system/apt-daily.service | ||
88 | install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/ | 89 | install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/ |
89 | install -d ${D}${sysconfdir}/cron.daily/ | 90 | install -d ${D}${sysconfdir}/cron.daily/ |
90 | install -m 0755 ${S}/debian/apt.apt-compat.cron.daily ${D}${sysconfdir}/cron.daily/ | 91 | install -m 0755 ${S}/debian/apt.apt-compat.cron.daily ${D}${sysconfdir}/cron.daily/ |
92 | sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${sysconfdir}/cron.daily/apt.apt-compat.cron.daily | ||
91 | } | 93 | } |