udev: Use udev.inc and add udevadm to udev pacakge instead of udev-utils

* Main purpose of the patch was to fix the problem where udev-utils was
  needed to be in root file system just to get udevadm binary. So this
  binary is moved into udev package instead.

* Use INC_PR for all except udev 151.

* Use udev.inc in all recipes except udev 151.

* All udev recipes built udev_151 and udev_124 runs fine too.

* in udev_151 Add module-init-tools-depmod to RDEPENDS.

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

9 files changed, 92 insertions, 131 deletions

diff --git a/recipes/udev/udev-static_124.bb b/recipes/udev/udev-static_124.bb
index bcd3138fdb..7348a6ca63 100644
--- a/recipes/udev/udev-static_124.bb
+++ b/recipes/udev/udev-static_124.bb
@@ -1,15 +1,18 @@
 DESCRIPTION = "Static version of udev for devices with an old (e.g. <2.6.27) kernel"
 
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch \
-	   file://flags.patch \
-	   file://vol_id_ld.patch \
-	   file://udevtrigger_add_devname_filtering.patch \
-	   file://libvolume-id-soname.patch \
-	   file://mtd-exclude-persistent.patch \
+require udev.inc
+
+SRC_URI += "file://noasmlinkage.patch \
+	    file://flags.patch \
+	    file://vol_id_ld.patch \
+	    file://udevtrigger_add_devname_filtering.patch \
+	    file://libvolume-id-soname.patch \
+	    file://mtd-exclude-persistent.patch \
 	   "
 
-require udev.inc
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
 
 S = "${WORKDIR}/udev-${PV}"
 
diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc
index 14d10b45cc..943fdfcc19 100644
--- a/recipes/udev/udev.inc
+++ b/recipes/udev/udev.inc
@@ -1,8 +1,9 @@
 DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
+
 LICENSE = "GPLv2+"
 
-SRC_URI += " \
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://udev.rules \
 	   file://devfs-udev.rules \
 	   file://links.conf \
@@ -12,6 +13,8 @@ SRC_URI += " \
 	   file://local.rules \
            file://init"
 
+INC_PR = "r26"
+
 inherit update-rc.d autotools pkgconfig
 
 PARALLEL_MAKE = ""
@@ -19,18 +22,19 @@ UDEV_DEVFS_RULES ?= "0"
 PKG_libvolume-id-dev = "libvolume-id-dev"
 
 INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 04 S ."
+INITSCRIPT_PARAMS = "start 03 S ."
 
 export CROSS = "${TARGET_PREFIX}"
 export HOSTCC = "${BUILD_CC}"
 export udevdir ?= "/dev"
+# Put stuff in /lib and /sbin
+export bindir := "${base_bindir}"
+export sbindir := "${base_sbindir}"
 export usrbindir := "${bindir}"
 export usrsbindir := "${sbindir}"
-export etcdir = "${sysconfdir}"
-LD = "${CC}"
-bindir = "/bin"
-sbindir = "/sbin"
+export etcdir := "${sysconfdir}"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
 UDEV_EXTRAS = "<override me>"
 EXTRA_OEMAKE = "-e \
 		'EXTRAS=${UDEV_EXTRAS}' \
@@ -56,17 +60,13 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
 	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-}
-
-do_stage () {
-	autotools_stage_all
-        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
-        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
+        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${D}${includedir}
+        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${D}${libdir}
 }
 
 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 ${sbindir}/udevadm ${usrbindir}/udevtest"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
 FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd ${sbindir}/udevadm"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
diff --git a/recipes/udev/udev_092.bb b/recipes/udev/udev_092.bb
index 48929d3559..3ed05d138c 100644
--- a/recipes/udev/udev_092.bb
+++ b/recipes/udev/udev_092.bb
@@ -3,21 +3,20 @@ 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."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r25"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch \
-	   file://flags.patch \
-	   file://udevsynthesize.patch \
-	   file://udevsynthesize.sh \
-           file://arm_inotify_fix.patch \
-	   file://mtd-exclude-persistent.patch \
-	   file://mount.blacklist \
-	   "
-
 require udev.inc
 
-INITSCRIPT_PARAMS = "start 03 S ."
+LD = "${CC}"
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://noasmlinkage.patch;patch=1 \
+	    file://flags.patch;patch=1 \
+	    file://udevsynthesize.patch;patch=1 \
+	    file://udevsynthesize.sh \
+            file://arm_inotify_fix.patch;patch=1 \
+	    file://mtd-exclude-persistent.patch;patch=1 \
+	    file://mount.blacklist \
+	   "
 
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
diff --git a/recipes/udev/udev_097.bb b/recipes/udev/udev_097.bb
index 8d63fea0a6..8757794048 100644
--- a/recipes/udev/udev_097.bb
+++ b/recipes/udev/udev_097.bb
@@ -8,17 +8,16 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r13"
+require udev.inc
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch \
-	   file://flags.patch \
-	   file://mount.blacklist \
-	   "
+PR = "${INC_PR}.0"
 
-require udev.inc
+LD = "${CC}"
 
-INITSCRIPT_PARAMS = "start 03 S ."
+SRC_URI += "file://noasmlinkage.patch;patch=1 \
+	    file://flags.patch;patch=1 \
+	    file://mount.blacklist \
+	   "
 
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
diff --git a/recipes/udev/udev_100.bb b/recipes/udev/udev_100.bb
index 9ebf707532..7261483d49 100644
--- a/recipes/udev/udev_100.bb
+++ b/recipes/udev/udev_100.bb
@@ -9,19 +9,18 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r16"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch \
-	   file://flags.patch \
-	   file://mtd-exclude-persistent.patch \
-	   file://mount.blacklist \
-	   file://mount.sh \
-	   "
-
 require udev.inc
 
-INITSCRIPT_PARAMS = "start 03 S ."
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
+
+SRC_URI += "file://noasmlinkage.patch;patch=1 \
+	    file://flags.patch;patch=1 \
+	    file://mtd-exclude-persistent.patch;patch=1 \
+	    file://mount.blacklist \
+	    file://mount.sh \
+	   "
 
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
diff --git a/recipes/udev/udev_118.bb b/recipes/udev/udev_118.bb
index c16ee86eec..aeebbe9392 100644
--- a/recipes/udev/udev_118.bb
+++ b/recipes/udev/udev_118.bb
@@ -3,12 +3,15 @@ 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."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r6"
+require udev.inc
+
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
 
 DEFAULT_PREFERENCE = "-118"
 
-SRC_URI = "\
- http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+SRC_URI += "\
  file://flags.patch \
  file://vol_id_ld.patch \
  file://udevtrigger_add_devname_filtering.patch \
@@ -17,10 +20,6 @@ SRC_URI = "\
 "
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-require udev.inc
-
-INITSCRIPT_PARAMS = "start 03 S ."
-
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb
index 35e061878d..30b049976d 100644
--- a/recipes/udev/udev_124.bb
+++ b/recipes/udev/udev_124.bb
@@ -2,28 +2,28 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
-PR = "r19"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://noasmlinkage.patch \
-	   file://flags.patch \
-	   file://vol_id_ld.patch \
-	   file://udevtrigger_add_devname_filtering.patch \
-	   file://libvolume-id-soname.patch \
-	   file://mtd-exclude-persistent.patch \
-	   file://mount.blacklist \
-	   file://run.rules \
-	   file://default \
-	   file://local.rules \
+
+require udev.inc
+
+PR = "${INC_PR}.0"
+
+LD = "${CC}"
+
+SRC_URI += "file://noasmlinkage.patch \
+	    file://flags.patch \
+	    file://vol_id_ld.patch \
+	    file://udevtrigger_add_devname_filtering.patch \
+	    file://libvolume-id-soname.patch \
+	    file://mtd-exclude-persistent.patch \
+	    file://mount.blacklist \
+	    file://run.rules \
+	    file://default \
+	    file://local.rules \
 	   "
 
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
 PACKAGE_ARCH_h2200 = "h2200"
 
-require udev.inc
-
-INITSCRIPT_PARAMS = "start 03 S ."
-
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb
index 4be7ae51e1..27055beac9 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -1,33 +1,19 @@
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
-LICENSE = "GPLv2+"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r21"
+require udev.inc
 
-# needed for init.d script
-RDEPENDS_${PN} += "udev-utils"
+PR = "${INC_PR}.0"
 
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-	   file://mount.blacklist \
-	   file://run.rules \
+SRC_URI += "file://mount.blacklist \
+	    file://run.rules \
+	    file://default \
+	    file://cache \
 	   "
-SRC_URI += " \
-       file://udev.rules \
-       file://devfs-udev.rules \
-       file://links.conf \
-       file://permissions.rules \
-       file://mount.sh \
-       file://network.sh \
-       file://local.rules \
-       file://default \
-       file://init \
-       file://cache \
-"
-
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
 PACKAGE_ARCH_h2200 = "h2200"
 
@@ -39,26 +25,16 @@ SRC_URI_append_bug = " \
 
 PACKAGE_ARCH_bug = "bug"
 
-inherit update-rc.d autotools_stage
-
-# Put stuff in /lib and /sbin
-export sbindir="${base_sbindir}"
-export exec_prefix=""
 EXTRA_OECONF += " --with-udev-prefix= \
                   --with-libdir-name=${base_libdir} \
 "
 
-INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 03 S ."
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
 
-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 ${sbindir}/udevadm ${usrbindir}/udevtest"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+LEAD_SONAME = "libudev.so.0"
 
 RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd ${sbindir}/udevadm"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 
 # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
@@ -103,6 +79,8 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
 	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+        oe_libinstall -C udev/lib -so libudev ${D}${libdir}
+        install ${S}/udev/lib/libudev.h ${D}${includedir}
 }
 
 do_install_append_h2200() {
@@ -132,19 +110,5 @@ if [ -d $D/lib/udev/rules.d ] ; then
 fi
 }
 
-do_stage_append() {
-        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
-        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
-        oe_libinstall -C udev/lib -so libudev ${STAGING_LIBDIR}
-        # Since we change exec_prefix above, autotools_stage_all will not see the .pc files
-        # When we upgrade to 145 with the path bugs fixed we can drop all this (see poky)
-        install -d ${STAGING_DIR_TARGET}${prefix}${libdir}/pkgconfig/
-        install ${S}/extras/volume_id/lib/libvolume_id.pc ${STAGING_DIR_TARGET}${prefix}${libdir}/pkgconfig/
-        install ${S}/udev/lib/libudev.pc ${STAGING_DIR_TARGET}${prefix}${libdir}/pkgconfig/
-	install -d ${STAGING_DIR_TARGET}${prefix}${includedir}/
-        install ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_DIR_TARGET}${prefix}${includedir}/
-        install ${S}/udev/lib/libudev.h ${STAGING_DIR_TARGET}${prefix}${includedir}/
-}
-
 SRC_URI[md5sum] = "86382b7bbc64459e714c65a2a4e10916"
 SRC_URI[sha256sum] = "001be4a8963c48e7debc82c6078562d087a2979da63e558a5e3613c03725c377"
diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index d7df81a268..04c2132e17 100644
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,16 +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 = "r9"
+PR = "r10"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
 
 # Needed for udev-extras
 DEPENDS = "gperf-native usbutils acl glib-2.0"
-
-# needed for init.d script
-RDEPENDS_${PN} += "udev-utils"
+RDEPENDS_${PN} += "module-init-tools-depmod"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://mount.blacklist \
@@ -63,10 +61,10 @@ PACKAGES =+ "libudev libgudev udev-utils"
 FILES_libudev = "${libdir}/libudev.so.*"
 FILES_libgudev = "${libdir}/libgudev*.so.*"
 
-FILES_udev-utils = "${bindir}/udevinfo ${base_sbindir}/udevadm ${bindir}/udevtest"
+FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest"
 
 RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd ${base_sbindir}/udevadm"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 
 # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}