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:15:16 +0100 |
commit | 8dedc082bac4181a6daacf0882e5e67538c86e70 (patch) | |
tree | c072abf406ab4b8d9124c9bd8fc98d748e8c145d /meta/classes/systemd.bbclass | |
parent | 703104c2789e96532daf25f1de27593f6b6d174a (diff) | |
download | poky-8dedc082bac4181a6daacf0882e5e67538c86e70.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.
(From OE-Core rev: c700cb21c189e23a78f0efaaf763259c8cfefa4d)
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/classes/systemd.bbclass')
-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 (){ | |||
168 | systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True)) | 168 | systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True)) |
169 | if os.path.exists(systemd_unitdir): | 169 | if os.path.exists(systemd_unitdir): |
170 | shutil.rmtree(systemd_unitdir) | 170 | shutil.rmtree(systemd_unitdir) |
171 | base_libdir = oe.path.join(d.getVar("D", True), d.getVar('base_libdir', True)) | ||
172 | if (os.path.exists(base_libdir) and not os.listdir(base_libdir)): | ||
173 | os.rmdir(base_libdir) | ||
171 | } | 174 | } |
172 | do_install[postfuncs] += "rm_systemd_unitdir " | 175 | do_install[postfuncs] += "rm_systemd_unitdir " |
173 | 176 | ||