[PATCH] apt-package: use ${libdir} instead of /usr/lib

[PATCH] apt-package: use ${libdir} instead of /usr/lib

[Saul Wold]

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

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/apt/apt-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index 839d58e..7ebde38 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -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/
-- 
2.7.4

Re: [PATCH] apt-package: use ${libdir} instead of /usr/lib

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

On 17 February 2017 at 18:28, Saul Wold <sgw@linux.intel.com> wrote:

> -       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

[-- Attachment #2: Type: text/html, Size: 1421 bytes --]

Re: [PATCH] apt-package: use ${libdir} instead of /usr/lib

[Saul Wold]

On Fri, 2017-02-17 at 20:40 +0000, Burton, Ross wrote:
> 
> On 17 February 2017 at 18:28, Saul Wold <sgw@linux.intel.com> wrote:
> > -       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.
> 
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!

> Ross

Re: [PATCH] apt-package: use ${libdir} instead of /usr/lib

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

On 20 February 2017 at 07:21, Saul Wold <sgw@linux.intel.com> wrote:

> 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

[-- Attachment #2: Type: text/html, Size: 836 bytes --]