diff options
| author |   Muhammad Shakeel <muhammad_shakeel@mentor.com> | 2013-09-04 11:05:03 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-10 23:14:36 +0100 |
| commit | c700cb21c189e23a78f0efaaf763259c8cfefa4d (patch) | |
| tree | 0b747d75f40df24bcb02b0c14e12630e18498dd9 /meta | |
| parent | 644394c074c359505fcd750356fb4db58b939729 (diff) | |
| download | openembedded-core-c700cb21c189e23a78f0efaaf763259c8cfefa4d.tar.gz | |
systemd: Remove base_libdir if installed only for systemd_unitdir
If a recipe installs systemd_unitdir and it is a non-systemd build than
systemd.bbclass deletes systemd_unitdir (/lib/systemd/) but not
base_libdir (/lib). In this case if base_libdir is empty than following
QA Issue is reported.
ERROR: QA Issue: openssh: Files/directories were installed but not shipped
/lib
If base_libdir was installed due to systemd_unitdir installation than for
non-systemd build it should also be removed.
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/systemd.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 76f0e7da1f..8ec4992db3 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -168,6 +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) } do_install[postfuncs] += "rm_systemd_unitdir " |