From c700cb21c189e23a78f0efaaf763259c8cfefa4d Mon Sep 17 00:00:00 2001 From: Muhammad Shakeel Date: Wed, 4 Sep 2013 11:05:03 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/systemd.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes') 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 " -- cgit 1.2.3-korg