diff options
Diffstat (limited to 'meta/classes/systemd.bbclass')
-rw-r--r-- | meta/classes/systemd.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 2bd63a405b..a6ad723dfd 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass | |||
@@ -15,9 +15,9 @@ python __anonymous() { | |||
15 | # If the distro features have systemd but not sysvinit, inhibit update-rcd | 15 | # If the distro features have systemd but not sysvinit, inhibit update-rcd |
16 | # from doing any work so that pure-systemd images don't have redundant init | 16 | # from doing any work so that pure-systemd images don't have redundant init |
17 | # files. | 17 | # files. |
18 | if oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): | 18 | if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): |
19 | d.appendVar("DEPENDS", " systemd-systemctl-native") | 19 | d.appendVar("DEPENDS", " systemd-systemctl-native") |
20 | if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): | 20 | if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): |
21 | d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") | 21 | d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") |
22 | } | 22 | } |
23 | 23 | ||
@@ -57,7 +57,7 @@ fi | |||
57 | systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst" | 57 | systemd_populate_packages[vardeps] += "systemd_prerm systemd_postinst" |
58 | 58 | ||
59 | python systemd_populate_packages() { | 59 | python systemd_populate_packages() { |
60 | if not oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): | 60 | if not bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): |
61 | return | 61 | return |
62 | 62 | ||
63 | def get_package_var(d, var, pkg): | 63 | def get_package_var(d, var, pkg): |
@@ -172,7 +172,7 @@ PACKAGESPLITFUNCS_prepend = "systemd_populate_packages " | |||
172 | 172 | ||
173 | python rm_systemd_unitdir (){ | 173 | python rm_systemd_unitdir (){ |
174 | import shutil | 174 | import shutil |
175 | if not oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): | 175 | if not bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): |
176 | systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True)) | 176 | systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True)) |
177 | if os.path.exists(systemd_unitdir): | 177 | if os.path.exists(systemd_unitdir): |
178 | shutil.rmtree(systemd_unitdir) | 178 | shutil.rmtree(systemd_unitdir) |
@@ -186,8 +186,8 @@ python rm_sysvinit_initddir (){ | |||
186 | import shutil | 186 | import shutil |
187 | sysv_initddir = oe.path.join(d.getVar("D", True), (d.getVar('INIT_D_DIR', True) or "/etc/init.d")) | 187 | sysv_initddir = oe.path.join(d.getVar("D", True), (d.getVar('INIT_D_DIR', True) or "/etc/init.d")) |
188 | 188 | ||
189 | if oe.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \ | 189 | if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \ |
190 | not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ | 190 | not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ |
191 | os.path.exists(sysv_initddir): | 191 | os.path.exists(sysv_initddir): |
192 | systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True), "system") | 192 | systemd_unitdir = oe.path.join(d.getVar("D", True), d.getVar('systemd_unitdir', True), "system") |
193 | 193 | ||