diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2013-09-10 10:28:14 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-10 23:15:09 +0100 |
| commit | 5b451a46550ba62e2fbfe5dbe50723b34a4fd527 (patch) | |
| tree | 07e4fdbf233a707e94a8921ce8b7942aabc2b78b | |
| parent | c700cb21c189e23a78f0efaaf763259c8cfefa4d (diff) | |
| download | openembedded-core-contrib-5b451a46550ba62e2fbfe5dbe50723b34a4fd527.tar.gz | |
systemd.bbclass: get the correct /lib directory
By using os.path.dirname(systemd_unitdir) we get the correct /lib directory instead of
dealing with possibly multilib directories. This address a QA Error for shipped/not
installed /lib with multilib and x32.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/systemd.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 8ec4992db36..eab8735b7cf 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -168,9 +168,9 @@ python rm_systemd_unitdir (){ systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True)) if os.path.exists(systemd_unitdir): shutil.rmtree(systemd_unitdir) - base_libdir = oe.path.join(d.getVar("D", True), d.getVar('base_libdir', True)) - if (os.path.exists(base_libdir) and not os.listdir(base_libdir)): - os.rmdir(base_libdir) + systemd_libdir = os.path.dirname(systemd_unitdir) + if (os.path.exists(systemd_libdir) and not os.listdir(systemd_libdir)): + os.rmdir(systemd_libdir) } do_install[postfuncs] += "rm_systemd_unitdir " |