udev: Move udevadm back from udev to udev-utils package.

* hald needs udevadm but not all of udev. If this binary
  is moved into udev then it will have to pull in udev
  which is unwanted.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc
index 943fdfc..1fb75fe 100644 (file)
--- a/recipes/udev/udev.inc
+++ b/recipes/udev/udev.inc
@@ -13,7 +13,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
           file://local.rules \
            file://init"
 
-INC_PR = "r26"
+INC_PR = "r27"
 
 inherit update-rc.d autotools pkgconfig
 
@@ -21,6 +21,8 @@ PARALLEL_MAKE = ""
 UDEV_DEVFS_RULES ?= "0"
 PKG_libvolume-id-dev = "libvolume-id-dev"
 
+RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
+
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 03 S ."
 
@@ -66,7 +68,7 @@ do_install () {
 
 PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
 FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest ${sbindir}/udevadm"
 FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd ${sbindir}/udevadm"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"

diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index 04c2132..9bf0872 100644 (file)
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,14 +3,14 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r10"
+PR = "r11"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
 
 # Needed for udev-extras
 DEPENDS = "gperf-native usbutils acl glib-2.0"
-RDEPENDS_${PN} += "module-init-tools-depmod"
+RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
           file://mount.blacklist \
@@ -61,10 +61,10 @@ PACKAGES =+ "libudev libgudev udev-utils"
 FILES_libudev = "${libdir}/libudev.so.*"
 FILES_libgudev = "${libdir}/libgudev*.so.*"
 
-FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest"
+FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
 
 RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd ${base_sbindir}/udevadm"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 
 # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}