[PATCH] systemd: bug fix for the path of systemd.conf

[PATCH] systemd: bug fix for the path of systemd.conf

[Zhang Xiao]

tmpfiles.d/systemd.conf lies in {prefix}/lib not {libdir}.
Fix it.

Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
---
 meta/recipes-core/systemd/systemd_219.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 6ed4fe0..04db47b 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -178,7 +178,7 @@ do_install() {
 	# 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)}
+		${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${prefix}/lib/tmpfiles.d/systemd.conf', d)}
 	fi
 }
 
-- 
1.8.5.2.233.g932f7e4

Re: [PATCH] systemd: bug fix for the path of systemd.conf

[Andreas Oberritter]

Hello Zhang Xiao,

On 03.07.2015 08:42, Zhang Xiao wrote:
> tmpfiles.d/systemd.conf lies in {prefix}/lib not {libdir}.
> Fix it.
> 
> Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
> ---
>  meta/recipes-core/systemd/systemd_219.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
> index 6ed4fe0..04db47b 100644
> --- a/meta/recipes-core/systemd/systemd_219.bb
> +++ b/meta/recipes-core/systemd/systemd_219.bb
> @@ -178,7 +178,7 @@ do_install() {
>  	# 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 ]; the
> -		${@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}/lib/tmpfiles.d/systemd.conf', d)}

wouldn't it be appropriate to change the conditional above, too?

Regards,
Andreas

Re: [PATCH] systemd: bug fix for the path of systemd.conf

[Burton, Ross]

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

On 3 July 2015 at 09:00, Andreas Oberritter <obi@opendreambox.org> wrote:

> >       if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; the
> > -             ${@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}/lib/tmpfiles.d/systemd.conf', d)}
>
> wouldn't it be appropriate to change the conditional above, too?
>

+1 on that.  Also you probably want $rootlibdir, a variable defined in the
systemd recipe to mirror the path names used in the systemd makefile.
Obviously check what path it's actually using.

Ross

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