diff options
author | Ross Burton <ross.burton@intel.com> | 2013-03-06 15:08:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 22:43:03 +0000 |
commit | a89520ffe122370d2fae237521d3c4854ee4a5ec (patch) | |
tree | 11317c328f20c6ad4ac1140f52ea18bab0645e9d /meta/recipes-core/systemd/systemd_197.bb | |
parent | 7bb060ebd0fd803710c20df3559fdd5a66e4d58e (diff) | |
download | poky-a89520ffe122370d2fae237521d3c4854ee4a5ec.tar.gz |
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 <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd_197.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd_197.bb | 13 |
1 files changed, 12 insertions, 1 deletions
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)}" | |||
16 | 16 | ||
17 | SECTION = "base/shell" | 17 | SECTION = "base/shell" |
18 | 18 | ||
19 | inherit gtk-doc useradd pkgconfig autotools perlnative | 19 | inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d |
20 | 20 | ||
21 | SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ | 21 | SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ |
22 | file://touchscreen.rules \ | 22 | file://touchscreen.rules \ |
@@ -26,6 +26,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ | |||
26 | file://00-create-volatile.conf \ | 26 | file://00-create-volatile.conf \ |
27 | file://0001-systemd-analyze-rewrite-in-C.patch \ | 27 | file://0001-systemd-analyze-rewrite-in-C.patch \ |
28 | file://udev-linkage.patch \ | 28 | file://udev-linkage.patch \ |
29 | file://init \ | ||
29 | " | 30 | " |
30 | SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743" | 31 | SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743" |
31 | SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5" | 32 | SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5" |
@@ -100,6 +101,11 @@ do_install() { | |||
100 | install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ | 101 | install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ |
101 | 102 | ||
102 | install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ | 103 | install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ |
104 | |||
105 | if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | ||
106 | install -d ${D}${sysconfdir}/init.d | ||
107 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd | ||
108 | fi | ||
103 | } | 109 | } |
104 | 110 | ||
105 | python populate_packages_prepend (){ | 111 | python populate_packages_prepend (){ |
@@ -210,6 +216,7 @@ FILES_udev += "${base_sbindir}/udevd \ | |||
210 | /lib/udev/rules.d/8*.rules \ | 216 | /lib/udev/rules.d/8*.rules \ |
211 | /lib/udev/rules.d/95*.rules \ | 217 | /lib/udev/rules.d/95*.rules \ |
212 | ${sysconfdir}/udev \ | 218 | ${sysconfdir}/udev \ |
219 | ${sysconfdir}/init.d/systemd-udevd \ | ||
213 | ${systemd_unitdir}/system/*udev* \ | 220 | ${systemd_unitdir}/system/*udev* \ |
214 | ${systemd_unitdir}/system/*.wants/*udev* \ | 221 | ${systemd_unitdir}/system/*.wants/*udev* \ |
215 | " | 222 | " |
@@ -221,6 +228,10 @@ FILES_udev-utils = "${bindir}/udevadm" | |||
221 | 228 | ||
222 | FILES_udev-hwdb = "${base_libdir}/udev/hwdb.d" | 229 | FILES_udev-hwdb = "${base_libdir}/udev/hwdb.d" |
223 | 230 | ||
231 | INITSCRIPT_PACKAGES = "udev" | ||
232 | INITSCRIPT_NAME_udev = "systemd-udevd" | ||
233 | INITSCRIPT_PARAMS_udev = "start 03 S ." | ||
234 | |||
224 | # TODO: | 235 | # TODO: |
225 | # u-a for runlevel and telinit | 236 | # u-a for runlevel and telinit |
226 | 237 | ||