apt-package: use ${libdir} instead of /usr/lib
PATCH 1/1 apt-package: use ${libdir} instead of /usr/lib
Fixes ssue when building with x32
+ install -m 0644 /srv/sdc/builds/poky/10698/tmp/work/corei7-64-pokymllib64-linux/lib64-apt/1.2.12-r0/apt-1.2.12/debian/apt.systemd.daily /srv/sdc/builds/poky/10698/tmp/work/corei7-64-pokymllib64-linux/lib64-apt/1.2.12-r0/image/usr/lib/apt/
install: target '/srv/sdc/builds/poky/10698/tmp/work/corei7-64-pokymllib64-linux/lib64-apt/1.2.12-r0/image/usr/lib/apt/' is not a directory: No such file or directory
--- meta/recipes-devtools/apt/apt-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/apt/apt-package.inc +1 -1
@@ -83,7 +83,7 @@ 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/ install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/ install -d ${D}${sysconfdir}/cron.daily/
Signature · 1 line
2.7.4
Quoted 7 lines · Saul Wold
meta/recipes-devtools/apt/apt-package.inc +1
-1- 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/
install -m 0644 ${S}/debian/apt-daily.timer${D}${systemd_unitdir}/system/
The apt-daily.service unit is what fires the apt.systemd.daily script:
$ cat debian/apt-daily.service ... ExecStart=/usr/lib/apt/apt.systemd.daily
If you're going to change the install location of the script then the unit needs to be fixed.
Ross
Quoted 15 lines · Ross
Quoted 9 lines · Saul Wold
- 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/
install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/The apt-daily.service unit is what fires the apt.systemd.daily script:
Quoted 7 lines
$ cat debian/apt-daily.service ... ExecStart=/usr/lib/apt/apt.systemd.dailyIf you're going to change the install location of the script then the unit needs to be fixed.
Hmm, since this is a script would it make more sense to have this install create the "usr/lib" directory? I am wondering is this will bullocks up a single root solution or a different non-standard libdir?
Sau!
Quoted 1 line
Ross
Quoted 4 lines · Saul Wold
Hmm, since this is a script would it make more sense to have this install create the "usr/lib" directory? I am wondering is this will bullocks up a single root solution or a different non-standard libdir?
/usr/lib will most likely exist, but if I were writing the patch I'd be sedding the right path into the unit.
Ross