From 5b451a46550ba62e2fbfe5dbe50723b34a4fd527 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 10 Sep 2013 10:28:14 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/systemd.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 8ec4992db3..eab8735b7c 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 " -- cgit 1.2.3-korg