From a89520ffe122370d2fae237521d3c4854ee4a5ec Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 6 Mar 2013 15:08:44 +0000 Subject: systemd: add udev init script for hybrid sysvinit/systemd usage With both sysvinit and systemd features it's possible to use systemd's udev with sysvinit, so add the required init script. (From OE-Core rev: b58a176936740e8e291f1e82229a8ca044bdb044) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_197.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/systemd/systemd_197.bb') diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index a006ec8e92..d07fa95fea 100644 --- a/meta/recipes-core/systemd/systemd_197.bb +++ b/meta/recipes-core/systemd/systemd_197.bb @@ -16,7 +16,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SECTION = "base/shell" -inherit gtk-doc useradd pkgconfig autotools perlnative +inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ file://touchscreen.rules \ @@ -26,6 +26,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ file://00-create-volatile.conf \ file://0001-systemd-analyze-rewrite-in-C.patch \ file://udev-linkage.patch \ + file://init \ " SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743" SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5" @@ -100,6 +101,11 @@ do_install() { install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + + if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd + fi } python populate_packages_prepend (){ @@ -210,6 +216,7 @@ FILES_udev += "${base_sbindir}/udevd \ /lib/udev/rules.d/8*.rules \ /lib/udev/rules.d/95*.rules \ ${sysconfdir}/udev \ + ${sysconfdir}/init.d/systemd-udevd \ ${systemd_unitdir}/system/*udev* \ ${systemd_unitdir}/system/*.wants/*udev* \ " @@ -221,6 +228,10 @@ FILES_udev-utils = "${bindir}/udevadm" FILES_udev-hwdb = "${base_libdir}/udev/hwdb.d" +INITSCRIPT_PACKAGES = "udev" +INITSCRIPT_NAME_udev = "systemd-udevd" +INITSCRIPT_PARAMS_udev = "start 03 S ." + # TODO: # u-a for runlevel and telinit -- cgit v1.2.3-54-g00ecf