diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2012-08-04 20:05:30 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-08-08 09:02:30 +0200 |
| commit | 980b338fb5100ff4c779335a86f3d9450ea8c54a (patch) | |
| tree | 1d6db1881f20819cbee0e8dcf9de37ad55478bd0 /meta-systemd/classes | |
| parent | 3ce8db6d187b864fa59206d4efa93b8f952b534e (diff) | |
| download | meta-openembedded-980b338fb5100ff4c779335a86f3d9450ea8c54a.tar.gz | |
systemd: Upgrade to 187 tag
Dont inherit vala not needed anymore
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
Additionally use --split-usr option since
in OE-Core now we want to treat /usr mounted
sepatately.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-systemd/classes')
| -rw-r--r-- | meta-systemd/classes/systemd.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index dd9f326102..4036f91cad 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/meta-systemd/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: |