udev: Split out consolekit and udev-acl

This can safe another megabyte on the tar.bz2 of the minimal
image. udev-acl is linking to glibc which will pull in libglib,
libgio, libgthread, libgmodule, libgobject.

2.0M 2011-07-02 01:57 after.tar.bz2
3.0M 2011-07-02 01:52 before.tar.bz2

(From OE-Core rev: 0c905ba71a8bf0fcd96ccaaa27faca00830ba8bb)

Signed-off-by: Holger Hans Peter Freyther <zecke@selfish.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 7 insertions, 1 deletions

diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
index 0247a83aff..eac790325e 100644
--- a/meta/recipes-core/udev/udev-new.inc
+++ b/meta/recipes-core/udev/udev-new.inc
@@ -35,6 +35,7 @@ libexecdir = "${base_libdir}/udev"
 EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \
                 --with-pci-ids-path=${datadir}/pci.ids"
 
+PACKAGES =+ "udev-acl udev-consolekit"
 PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg"
 PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
 
@@ -57,6 +58,11 @@ FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libg
                      ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
 FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
 
+FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules"
+
+RDEPENDS_udev-consolekit += "udev-acl"
+FILES_udev-consolekit = "${libdir}/ConsoleKit"
+
 do_install_append () {
         install -d ${D}${sysconfdir}/init.d
         install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 689b5fdb4a..7cbe4d8b60 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
 include udev-new.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://udev-166-v4l1-1.patch"