[oe-commits] Saul Wold : systemd.bbclass: get the correct /lib directory
git at git.openembedded.org
git at git.openembedded.org
Tue Sep 10 22:03:30 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 5b451a46550ba62e2fbfe5dbe50723b34a4fd527
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5b451a46550ba62e2fbfe5dbe50723b34a4fd527
Author: Saul Wold <sgw at linux.intel.com>
Date: Tue Sep 10 10:28:14 2013 -0700
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 <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/systemd.bbclass | 6 +++---
1 files 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 "
More information about the Openembedded-commits
mailing list