Skip to contentSkip to conversation

Ross Burton : update-rc.d: don't do anything if systemd. bbclass is inherited

oe-commits Martin Jansa 1 participant 1 message Mar 6, 2013 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Quoted 8 lines · On Mon, Feb 11, 2013 at 02:45:49PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 0273a22fec3c9360df2510b759c5bf9af610551f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0273a22fec3c9360df2510b759c5bf9af610551f
Author: Ross Burton <[email protected]>
Date:   Fri Feb  8 22:43:16 2013 +0000
Quoted 8 lines

update-rc.d: don't do anything if systemd.bbclass is inherited

We need the update-rc.d class to work when systemd is being used so that packages that only have SysV init scripts still work. However if a recipe supports both we don't want to install SysV and systemd files under systemd.

To solve this, before doing real work in update-rc.d check if the systemd class has been inherited and don't do anything if it has.

Does not work very well in current dbus recipe:

Configuring dbus-1.
update-rc.d: /etc/init.d/dbus-1: file does not exist Collected errors:
* pkg_run_script: package "dbus-1" postinst script returned status 1.
* opkg_configure: dbus-1.postinst returned 1.

dbus installs sysvinit script only when sysvinit is in DISTRO_FEATURES but update-rc.d is kept enabled because dbus does not inherit systemd

Quoted 42 lines

---

 meta/classes/update-rc.d.bbclass |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
meta/classes/update-rc.d.bbclass +11 -8
index f9d55fb..51ad8b1 100644
@@ -75,12 +75,15 @@ python populate_packages_updatercd () {
         postrm += d.getVar('updatercd_postrm', True)
         d.setVar('pkg_postrm_%s' % pkg, postrm)
 
-    pkgs = d.getVar('INITSCRIPT_PACKAGES', True)
-    if pkgs == None:
-        pkgs = d.getVar('UPDATERCPN', True)
-        packages = (d.getVar('PACKAGES', True) or "").split()
-        if not pkgs in packages and packages != []:
-            pkgs = packages[0]
-    for pkg in pkgs.split():
-        update_rcd_package(pkg)
+    # If the systemd class has also been inherited, then don't do anything as
+    # the systemd units will override anything created by update-rc.d.
+    if not d.getVar("SYSTEMD_BBCLASS_ENABLED", True):
+        pkgs = d.getVar('INITSCRIPT_PACKAGES', True)
+        if pkgs == None:
+            pkgs = d.getVar('UPDATERCPN', True)
+            packages = (d.getVar('PACKAGES', True) or "").split()
+            if not pkgs in packages and packages != []:
+                pkgs = packages[0]
+        for pkg in pkgs.split():
+            update_rcd_package(pkg)
 }

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]