Merge the contents of udev-systemd, which is just the service files, into udev
itself. This split wasn't intended to every happen in oe-core.
Signed-off-by: Ross Burton <ross.bur...@intel.com>
---
meta/recipes-core/systemd/systemd_197.bb | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_197.bb
b/meta/recipes-core/systemd/systemd_197.bb
index 0c3ebc4..675545f 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -171,7 +171,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"
# kbd -> loadkeys,setfont
# systemd calls 'modprobe -sab --', which busybox doesn't support due to lack
@@ -188,7 +188,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"
@@ -219,6 +219,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"
@@ -226,9 +228,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
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
