diff options
| author | Pau Espin Pedrol <pau.espin@aweurope.be> | 2015-07-30 13:33:12 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-09 15:14:31 -0700 |
| commit | 0cd61456c0ae912b9fa525db1b3c811e01349d27 (patch) | |
| tree | e1d317fc17fbe21b25f4ebe636ebadf0bf669b81 | |
| parent | ab26953276c543582fbaf2ad6f0a02d712ed90ea (diff) | |
| download | openembedded-core-0cd61456c0ae912b9fa525db1b3c811e01349d27.tar.gz openembedded-core-0cd61456c0ae912b9fa525db1b3c811e01349d27.tar.bz2 openembedded-core-0cd61456c0ae912b9fa525db1b3c811e01349d27.zip | |
systemd.bbclass: Use systemd_system_unitdir
Signed-off-by: Pau Espin Pedrol <pau.espin@aweurope.be>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/systemd.bbclass | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index cfe1eb56d5..46e72c7a4a 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -136,8 +136,7 @@ python systemd_populate_packages() { # Check service-files and call systemd_add_files_and_parse for each entry def systemd_check_services(): searchpaths = [oe.path.join(d.getVar("sysconfdir", True), "systemd", "system"),] - searchpaths.append(oe.path.join(d.getVar("nonarch_base_libdir", True), "systemd", "system")) - searchpaths.append(oe.path.join(d.getVar("exec_prefix", True), d.getVar("nonarch_base_libdir", True), "systemd", "system")) + searchpaths.append(d.getVar("systemd_system_unitdir", True)) systemd_packages = d.getVar('SYSTEMD_PACKAGES', True) keys = 'Also' @@ -185,10 +184,10 @@ python rm_sysvinit_initddir (){ if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \ not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ os.path.exists(sysv_initddir): - systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True), "system") + systemd_system_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_system_unitdir', True)) - # If systemd_unitdir contains anything, delete sysv_initddir - if (os.path.exists(systemd_unitdir) and os.listdir(systemd_unitdir)): + # If systemd_system_unitdir contains anything, delete sysv_initddir + if (os.path.exists(systemd_system_unitdir) and os.listdir(systemd_system_unitdir)): shutil.rmtree(sysv_initddir) } do_install[postfuncs] += "rm_sysvinit_initddir " |