Skip to contentSkip to conversation

systemd: fix do_install failure in case of multilib

PATCH In review Chen Qi 2 participants 4 messages Feb 10, 2015 – Feb 11, 2015

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover systemd: fix do_install failure in case of multilib

The following changes since commit 234b4feef24ffe0cea9b6d88d9c51a05ee63db9e:

linux-yocto/3.14: fix qemumips build error (2015-02-08 08:00:04 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-multilib
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-multilib

Chen Qi (1):
systemd: fix do_install failure in case of multilib

 meta/recipes-core/systemd/systemd_216.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 systemd: fix do_install failure in case of multilib

Instead of using ${libdir}, we should use ${prefix}${nonarch_base_libdir}, so that we don't get error like below at do_install time.

| sed: can't read /home/chenqi/poky/build-systemd/tmp/work/core2-64-poky-linux/systemd/1_216+gitAUTOINC+5d0ae62c66-r0/image/usr/lib64/tmpfiles.d/systemd.conf: No such file or directory
| WARNING: exit code 2 from a shell command.
| ERROR: Function failed: do_install (log file is located at /home/chenqi/poky/build-systemd/tmp/work/core2-64-poky-linux/systemd/1_216+gitAUTOINC+5d0ae62c66-r0/temp/log.do_install.327)
---
 meta/recipes-core/systemd/systemd_216.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_216.bb +1 -1
index 569e88c..f675c6a 100644
@@ -158,7 +158,7 @@ do_install() {
 	sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service
 	# this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it
 	# for existence else it fails
-	${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
+	${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${prefix}${nonarch_base_libdir}/tmpfiles.d/systemd.conf', d)}
 }
 
 do_install_ptest () {
Signature · 1 line
1.9.1
#2 lore raw
Quoted 7 lines · Chen Qi

- ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e
"\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
+ ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e
"\$ad /run/systemd/netif/links 0755 root root -" ${D}${prefix}${nonarch_base_libdir}/tmpfiles.d/systemd.conf', d)}

systemd.bb has a few variables that mirror the variabes used in the systemd build system, rootprefix/rootlibdir/rootlibexecdir. Would using one of those match the variables used in the makefile to install these files to avoid this sort of thing happening again?

Ross

author
#3 lore raw
Quoted 11 lines · Ross

On 10 February 2015 at 09:14, Chen Qi <[email protected] <mailto:[email protected]>> wrote:

    -  ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i
    -e "\$ad /run/systemd/netif/links 0755 root root -"
    ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
    +       ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed
    -i -e "\$ad /run/systemd/netif/links 0755 root root -"
    ${D}${prefix}${nonarch_base_libdir}/tmpfiles.d/systemd.conf', d)}
Quoted 3 lines

systemd.bb <http://systemd.bb> has a few variables that mirror the variabes used in the systemd build system, rootprefix/rootlibdir/rootlibexecdir. Would using one of those match the variables used in the makefile to install these files to avoid this sort of thing happening again?

Ross

Hmm... I don't quite get you. But this do_install error was introduced into OE by a recent commit.

commit 2a675bc63b22724f12e6ed6ff58d0f1d1e0d3b29
Date: Thu Jan 29 12:44:20 2015 -0800

systemd: Backports fixes to 216

Fix systemd-timesyncd assertion

when networkd is disabled then we now do not
create /run/systemd/netif/links but timesyncd needs it. So lets manually create this file when networkd is disabled so timesyncd can still function

When enabling systemd-timesyncd we need systemd-timesync user

Backport patches to enable timesyncd when resolved and networkd are disabled

replace the resolv.conf symlinink patch with a proper backport

Best Regards,
Chen Qi