sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: c54970c5ce85a6155ed00cbb4044e1830f9538bc)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2013-02-12 17:24:18 +00:00 committed by Richard Purdie
parent 123e3c2fba
commit 850278783c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-core/systemd/systemd_197.bb
View File

@ -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