diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-02-12 17:24:18 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 22:42:36 +0000 |
| commit | c54970c5ce85a6155ed00cbb4044e1830f9538bc (patch) | |
| tree | 86adee1007118b451c7ca283015f23de85212147 /meta/recipes-core/systemd | |
| parent | 5dcfe269c844673102beaacc6007fbd49f6b6d90 (diff) | |
| download | openembedded-core-contrib-c54970c5ce85a6155ed00cbb4044e1830f9538bc.tar.gz | |
systemd: merge udev-systemd into udev
Merge the contents of udev-systemd, which is just the service files, into udev
itself. This split wasn't intended to ever happen in oe-core.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/systemd')
| -rw-r--r-- | meta/recipes-core/systemd/systemd_197.bb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index dc54f366f7..9a66a4e9ab 100644 --- a/meta/recipes-core/systemd/systemd_197.bb +++ b/meta/recipes-core/systemd/systemd_197.bb @@ -173,7 +173,7 @@ FILES_${PN} = " ${base_bindir}/* \ FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" -RDEPENDS_${PN} += "dbus udev-systemd" +RDEPENDS_${PN} += "dbus" RRECOMMENDS_${PN} += "systemd-serialgetty \ util-linux-agetty \ @@ -181,7 +181,7 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ " -PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd" +PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils" FILES_udev-dbg += "/lib/udev/.debug" @@ -212,6 +212,8 @@ FILES_udev += "${base_sbindir}/udevd \ /lib/udev/rules.d/95*.rules \ ${base_libdir}/udev/hwdb.d \ ${sysconfdir}/udev \ + ${systemd_unitdir}/system/*udev* \ + ${systemd_unitdir}/system/*.wants/*udev* \ " FILES_udev-consolekit += "/lib/ConsoleKit" @@ -219,9 +221,6 @@ RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'console FILES_udev-utils = "${bindir}/udevadm" -FILES_udev-systemd = "${systemd_unitdir}/system/*udev* ${systemd_unitdir}/system/*.wants/*udev*" -RDEPENDS_udev-systemd = "udev" - # TODO: # u-a for runlevel and telinit |