diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2012-10-09 06:44:06 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2013-01-08 09:31:51 -0800 |
| commit | 69b0e85b415e8cf1b86cdc4251f7a16a8d1db4e4 (patch) | |
| tree | 312758809fea39c0fca57d0d96b40cbe8971cc61 /meta-systemd/classes | |
| parent | 4202d1a6e6573ed54fd242d8d7bf267ab71ee0e6 (diff) | |
| download | meta-openembedded-69b0e85b415e8cf1b86cdc4251f7a16a8d1db4e4.tar.gz | |
systemd: Fix build when base_libdir is not /lib
we were carrying a wrong patch to fix rootlibdir
to adapt systemd to OE's notion of base_libdir
but thats not right and the units dont get initialised
properly when we have base_libdir which is not /lib
This patch fixes the use of base_libdir where
it should have been catering to notions of systemd/udev
for putting unit files and init scripts in /lib
and not in base_libdir
It also ignores the lib32-* packages so that systemd
build works for multilib enabled systems.
Adapt to nativesdk renaming
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-systemd/classes')
| -rw-r--r-- | meta-systemd/classes/systemd.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass index f26c6d1c1c..958249259a 100644 --- a/meta-systemd/classes/systemd.bbclass +++ b/meta-systemd/classes/systemd.bbclass @@ -70,7 +70,8 @@ def systemd_after_parse(d): bpn = d.getVar('BPN', 1) if bpn + "-native" != d.getVar('PN', 1) and \ bpn + "-cross" != d.getVar('PN', 1) and \ - bpn + "-nativesdk" != d.getVar('PN', 1): + not d.getVar('MLPREFIX', 1) and \ + "nativesdk-" + bpn != d.getVar('PN', 1): systemd_check_vars() for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split(): systemd_create_package(pkg_systemd) @@ -158,8 +159,8 @@ python populate_packages_prepend () { def systemd_check_services(): 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/' + ' ' + searchpaths += '/lib/systemd/system/' + ' ' + searchpaths += '/usr/lib/systemd/system/' + ' ' systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1) has_exactly_one_service = len(systemd_packages.split()) == 1 if has_exactly_one_service: |