summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPau Espin Pedrol <pau.espin@aweurope.be>2015-07-30 13:33:12 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 12:40:29 -0700
commit3255d0042e8440f044212b3110d5528f8a355362 (patch)
tree3a4c851008102585cda7af687653716cd74d83d5 /meta
parent319a69f1d757a577b50a2ca9c8fbf845eba8e274 (diff)
downloadpoky-3255d0042e8440f044212b3110d5528f8a355362.tar.gz
systemd.bbclass: Use systemd_system_unitdir
(From OE-Core rev: 0cd61456c0ae912b9fa525db1b3c811e01349d27) Signed-off-by: Pau Espin Pedrol <pau.espin@aweurope.be> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/systemd.bbclass9
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() {
136 # Check service-files and call systemd_add_files_and_parse for each entry 136 # Check service-files and call systemd_add_files_and_parse for each entry
137 def systemd_check_services(): 137 def systemd_check_services():
138 searchpaths = [oe.path.join(d.getVar("sysconfdir", True), "systemd", "system"),] 138 searchpaths = [oe.path.join(d.getVar("sysconfdir", True), "systemd", "system"),]
139 searchpaths.append(oe.path.join(d.getVar("nonarch_base_libdir", True), "systemd", "system")) 139 searchpaths.append(d.getVar("systemd_system_unitdir", True))
140 searchpaths.append(oe.path.join(d.getVar("exec_prefix", True), d.getVar("nonarch_base_libdir", True), "systemd", "system"))
141 systemd_packages = d.getVar('SYSTEMD_PACKAGES', True) 140 systemd_packages = d.getVar('SYSTEMD_PACKAGES', True)
142 141
143 keys = 'Also' 142 keys = 'Also'
@@ -185,10 +184,10 @@ python rm_sysvinit_initddir (){
185 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \ 184 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \
186 not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ 185 not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \
187 os.path.exists(sysv_initddir): 186 os.path.exists(sysv_initddir):
188 systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True), "system") 187 systemd_system_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_system_unitdir', True))
189 188
190 # If systemd_unitdir contains anything, delete sysv_initddir 189 # If systemd_system_unitdir contains anything, delete sysv_initddir
191 if (os.path.exists(systemd_unitdir) and os.listdir(systemd_unitdir)): 190 if (os.path.exists(systemd_system_unitdir) and os.listdir(systemd_system_unitdir)):
192 shutil.rmtree(sysv_initddir) 191 shutil.rmtree(sysv_initddir)
193} 192}
194do_install[postfuncs] += "rm_sysvinit_initddir " 193do_install[postfuncs] += "rm_sysvinit_initddir "