Patchwork bitbake.conf: Change systemd_unitdir definition

login
register
mail settings
Submitter Khem Raj
Date Oct. 26, 2012, 7:03 a.m.
Message ID <1351235029-31096-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/38579/
State New
Headers show

Comments

Khem Raj - Oct. 26, 2012, 7:03 a.m.
systemd_unitdir indicates the arch independent
files which are basically scripts and unit files
and systemd wants then to be in /lib always even
when base_libdir is  /lib64, hence we have to reflect
that and not use base_libdir to define it. Otherwise
on architectures where base_libdir is lib64 e.g. ppc64
or multilibbed x86_64 this wont work

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/bitbake.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Oct. 28, 2012, 1:14 a.m.
On 10/26/2012 12:03 AM, Khem Raj wrote:
> systemd_unitdir indicates the arch independent
> files which are basically scripts and unit files
> and systemd wants then to be in /lib always even
> when base_libdir is  /lib64, hence we have to reflect
> that and not use base_libdir to define it. Otherwise
> on architectures where base_libdir is lib64 e.g. ppc64
> or multilibbed x86_64 this wont work
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   meta/conf/bitbake.conf |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 5cb5b13..e7fa731 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -31,6 +31,7 @@ export localstatedir = "${base_prefix}/var"
>   export infodir = "${datadir}/info"
>   export mandir = "${datadir}/man"
>   export docdir = "${datadir}/doc"
> +export systemd_unitdir = "/lib/systemd"
>
>   # Architecture dependent paths
>   export bindir = "${exec_prefix}/bin"
> @@ -39,7 +40,6 @@ export libexecdir = "${exec_prefix}/libexec"
>   export libdir = "${exec_prefix}/${baselib}"
>   export includedir = "${exec_prefix}/include"
>   export oldincludedir = "${exec_prefix}/include"
> -export systemd_unitdir = "${base_libdir}/systemd"
>   localedir = "${libdir}/locale"
>
>   # Linkage between native/cross/nativesdk layouts
>
Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5cb5b13..e7fa731 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -31,6 +31,7 @@  export localstatedir = "${base_prefix}/var"
 export infodir = "${datadir}/info"
 export mandir = "${datadir}/man"
 export docdir = "${datadir}/doc"
+export systemd_unitdir = "/lib/systemd"
 
 # Architecture dependent paths
 export bindir = "${exec_prefix}/bin"
@@ -39,7 +40,6 @@  export libexecdir = "${exec_prefix}/libexec"
 export libdir = "${exec_prefix}/${baselib}"
 export includedir = "${exec_prefix}/include"
 export oldincludedir = "${exec_prefix}/include"
-export systemd_unitdir = "${base_libdir}/systemd"
 localedir = "${libdir}/locale"
 
 # Linkage between native/cross/nativesdk layouts