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 <s...@linux.intel.com>
---
meta/classes/systemd.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 8ec4992..eab8735 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 "
--
1.8.3.1
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
