[PATCH][fido] systemd: fix tmpfiles location when multilib in use

[PATCH][fido] systemd: fix tmpfiles location when multilib in use

[Reinette Chatre]

Systemd's configuration files for creation, deletion and cleaning
of volatile and temporary files are installed in /usr/lib even when
multilib is in use (when /usr/lib64 is available). In this check the
systemd.conf file will not be found if libdir is /usr/lib64 so we fix the
path to match this file's installation path to look for it in
${exec_prefix}/lib

(From OE-Core rev: c1ef36c2b3e3876cc166a9a5e153fc6f23b42b92)

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Hi Joshua,

This is a backport of systemd fix that was recently merged to master. This
fixes broken timesynd in fido images built with multilib. Could you please
consider it for fido?

Thank you very much

Reinette

 meta/recipes-core/systemd/systemd_219.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index b972dd4..2f12284 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -181,8 +181,8 @@ do_install() {
 	sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf
 	# 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
-	if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then
-		${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
+	if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
+		${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
 	fi
 }
 
-- 
2.4.3

Re: [PATCH][fido] systemd: fix tmpfiles location when multilib in use

[Joshua Lock]

On 24/09/15 22:21, Reinette Chatre wrote:
> Systemd's configuration files for creation, deletion and cleaning
> of volatile and temporary files are installed in /usr/lib even when
> multilib is in use (when /usr/lib64 is available). In this check the
> systemd.conf file will not be found if libdir is /usr/lib64 so we fix the
> path to match this file's installation path to look for it in
> ${exec_prefix}/lib
>
> (From OE-Core rev: c1ef36c2b3e3876cc166a9a5e153fc6f23b42b92)
>
> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> Hi Joshua,
>
> This is a backport of systemd fix that was recently merged to master. This
> fixes broken timesynd in fido images built with multilib. Could you please
> consider it for fido?
>
> Thank you very much

Thanks Reinette,

I've queued this change in my joshuagl/fido-next branch[1].

Regards,

Joshua

1. 
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=joshuagl/fido-next

>
> Reinette
>
>   meta/recipes-core/systemd/systemd_219.bb | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
> index b972dd4..2f12284 100644
> --- a/meta/recipes-core/systemd/systemd_219.bb
> +++ b/meta/recipes-core/systemd/systemd_219.bb
> @@ -181,8 +181,8 @@ do_install() {
>   	sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf
>   	# 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
> -	if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then
> -		${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)}
> +	if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
> +		${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
>   	fi
>   }
>
>