mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 13:49:49 +00:00
Code Issues Projects Releases Wiki Activity

systemd.bbclass: Use systemd_system_unitdir

Browse Source 
(From OE-Core rev: 0cd61456c0ae912b9fa525db1b3c811e01349d27)

Signed-off-by: Pau Espin Pedrol <pau.espin@aweurope.be>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pau Espin Pedrol
2015-07-30 13:33:12 +02:00
committed by Richard Purdie
parent 319a69f1d7
commit 3255d0042e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/systemd.bbclass
+4 -5
View File
@@ -136,8 +136,7 @@ python systemd_populate_packages() {
# Check service-files and call systemd_add_files_and_parse for each entry # Check service-files and call systemd_add_files_and_parse for each entry
def systemd_check_services(): def systemd_check_services():
searchpaths = [oe.path.join(d.getVar("sysconfdir", True), "systemd", "system"),] 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(d.getVar("systemd_system_unitdir", True))
searchpaths.append(oe.path.join(d.getVar("exec_prefix", True), d.getVar("nonarch_base_libdir", True), "systemd", "system"))
systemd_packages = d.getVar('SYSTEMD_PACKAGES', True) systemd_packages = d.getVar('SYSTEMD_PACKAGES', True)
keys = 'Also' keys = 'Also'
@@ -185,10 +184,10 @@ python rm_sysvinit_initddir (){
if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \ if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \
not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \
os.path.exists(sysv_initddir): 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 systemd_system_unitdir contains anything, delete sysv_initddir
if (os.path.exists(systemd_unitdir) and os.listdir(systemd_unitdir)): if (os.path.exists(systemd_system_unitdir) and os.listdir(systemd_system_unitdir)):
shutil.rmtree(sysv_initddir) shutil.rmtree(sysv_initddir)
} }
do_install[postfuncs] += "rm_sysvinit_initddir " do_install[postfuncs] += "rm_sysvinit_initddir "