diff options
| author |   Ting Liu <b28495@freescale.com> | 2012-09-14 10:17:19 +0000 |
|---|---|---|
| committer |   Eric Bénard <eric@eukrea.com> | 2012-12-16 10:51:19 +0100 |
| commit | 35f92b4bd4a5f9bbea61237dc7702d87a8812503 (patch) | |
| tree | 0304d82f971bd239a709a18440ba54d5a448d626 /meta-oe | |
| parent | 6e0ddd4526f3e0005babe9381c17c06c22a9eda3 (diff) | |
| download | meta-openembedded-35f92b4bd4a5f9bbea61237dc7702d87a8812503.tar.gz | |
systemd: use system variables instead of hardcoded paths
Back port commit 980b338fb5100ff4c779335a86f3d9450ea8c54a
Below is the original commit message:
Fix build for ppc64
Consider /lib64 and /usr/lib64
Some 64bit architectures chose lib64 instead of lib
for default library dirnames. So we dig this from metadata
vars base_libdir and libdir instead of hardcoding 'lib'
ppc64 in OE uses lib64 for default libdir
and this leaves lot of udev/systemd
files unpackaged since 'lib' was hardcoded
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/classes/systemd.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass index a2c8ddf0ec..0d88c64310 100644 --- a/meta-oe/classes/systemd.bbclass +++ b/meta-oe/classes/systemd.bbclass @@ -154,7 +154,10 @@ python populate_packages_prepend () { # check service-files and call systemd_add_files_and_parse for each entry def systemd_check_services(): - searchpaths = '/etc/systemd/system/ /lib/systemd/system/ /usr/lib/systemd/system/' + base_libdir = d.getVar('base_libdir', 1) + searchpaths = '/etc/systemd/system/' + ' ' + searchpaths += d.getVar('base_libdir', 1) + '/systemd/system/' + ' ' + searchpaths += d.getVar('libdir', 1) + '/systemd/system/' + ' ' systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1) has_exactly_one_service = len(systemd_packages.split()) == 1 if has_exactly_one_service: |