diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-10-26 00:03:49 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-27 09:45:00 +0100 |
commit | ddd4dd8aa69cefc0dee2462d2b68b2cfb7734506 (patch) | |
tree | af3c88c92695567902d127fa3d6a984226f744e7 /meta/conf | |
parent | b4e48cc66c8e16aee6301258b5104d06c16c00dd (diff) | |
download | poky-ddd4dd8aa69cefc0dee2462d2b68b2cfb7734506.tar.gz |
bitbake.conf: Change systemd_unitdir definition
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
(From OE-Core rev: 50e713d4ae35f9b5f5f2a515a95d77573610d707)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 65efbb9d18..9f4cb58458 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -31,6 +31,7 @@ export localstatedir = "${base_prefix}/var" | |||
31 | export infodir = "${datadir}/info" | 31 | export infodir = "${datadir}/info" |
32 | export mandir = "${datadir}/man" | 32 | export mandir = "${datadir}/man" |
33 | export docdir = "${datadir}/doc" | 33 | export docdir = "${datadir}/doc" |
34 | export systemd_unitdir = "/lib/systemd" | ||
34 | 35 | ||
35 | # Architecture dependent paths | 36 | # Architecture dependent paths |
36 | export bindir = "${exec_prefix}/bin" | 37 | export bindir = "${exec_prefix}/bin" |
@@ -39,7 +40,6 @@ export libdir = "${exec_prefix}/${baselib}" | |||
39 | export libexecdir = "${libdir}/${BPN}" | 40 | export libexecdir = "${libdir}/${BPN}" |
40 | export includedir = "${exec_prefix}/include" | 41 | export includedir = "${exec_prefix}/include" |
41 | export oldincludedir = "${exec_prefix}/include" | 42 | export oldincludedir = "${exec_prefix}/include" |
42 | export systemd_unitdir = "${base_libdir}/systemd" | ||
43 | localedir = "${libdir}/locale" | 43 | localedir = "${libdir}/locale" |
44 | 44 | ||
45 | # Linkage between native/cross/nativesdk layouts | 45 | # Linkage between native/cross/nativesdk layouts |