[PATCH 0/3] Remove udev-utils and add 'udevadm' to udev package

[PATCH 0/3] Remove udev-utils and add 'udevadm' to udev package

[Chen Qi]

The following changes since commit f506d0660c9949485268a92724ac770b5457b0ca:

  linux-yocto/3.10: update to v3.10.43 (2014-06-17 17:56:42 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/remove-udev-utils
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/remove-udev-utils

Chen Qi (3):
  udev: remove udev-utils, add 'udevadm' to udev package
  systemd: remove udev-utils, move 'udevadm' to udev package
  initramfs-framework: get rid of udev-utils

 .../initrdscripts/initramfs-framework_1.0.bb       |    2 +-
 meta/recipes-core/systemd/systemd_213.bb           |    9 +++------
 meta/recipes-core/udev/udev.inc                    |    8 +++-----
 3 files changed, 7 insertions(+), 12 deletions(-)

-- 
1.7.9.5

[PATCH 1/3] udev: remove udev-utils, add 'udevadm' to udev package

[Chen Qi]

Previously, the udev package only RRECOMMENDS udev-utils package,
but its init script in the udev package really relies on the
'udevadm' command to work properly. As a result, if 'NO_RECOMMENDATIONS'
is set to '1', errors occur at system start-up.

The udev-utils package only contains one file, that is /bin/udevadm.
So it's better that we remove the udev-utils package and move the
'udevadm' command to the udev package.

[YOCTO #6388]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/udev/udev.inc |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index f9d544e..11204aa 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -47,7 +47,7 @@ EXTRA_OECONF = "--disable-introspection \
                 --without-systemdsystemunitdir \
                "
 
-PACKAGES =+ "udev-utils udev-cache"
+PACKAGES =+ "udev-cache"
 PACKAGES =+ "libudev"
 PACKAGES =+ "libgudev"
 
@@ -57,8 +57,8 @@ INITSCRIPT_PARAMS_udev = "start 04 S ."
 INITSCRIPT_NAME_udev-cache = "udev-cache"
 INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
 
-FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev"
-RRECOMMENDS_${PN} += "udev-utils udev-cache"
+FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev ${bindir}/udevadm"
+RRECOMMENDS_${PN} += "udev-cache"
 
 FILES_${PN}-dbg += "${libexecdir}/.debug"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
@@ -73,8 +73,6 @@ FILES_libudev = "${base_libdir}/libudev.so.*"
 FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
 FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
 
-FILES_udev-utils = "${bindir}/udevadm"
-
 do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
-- 
1.7.9.5

[PATCH 2/3] systemd: remove udev-utils, move 'udevadm' to udev package

[Chen Qi]

The udev package RDEPENDS on the udev-utils package, and the actually
udev-utils package relies on the udev package because if there's no
udev daemon, 'udevadm' command doesn't make much sense.

Now that we have removed udev-utils package and moved 'udevadm' to
the udev package in the older udev recipe, we should do the same
for systemd.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/systemd/systemd_213.bb |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_213.bb
index 279cf23..28cc4cb 100644
--- a/meta/recipes-core/systemd/systemd_213.bb
+++ b/meta/recipes-core/systemd/systemd_213.bb
@@ -250,16 +250,13 @@ RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units \
                       kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
 "
 
-PACKAGES =+ "udev-dbg udev udev-utils udev-hwdb"
+PACKAGES =+ "udev-dbg udev udev-hwdb"
 
 FILES_udev-dbg += "/lib/udev/.debug"
 
-RDEPENDS_udev += "udev-utils"
 RPROVIDES_udev = "hotplug"
 RRECOMMENDS_udev += "udev-hwdb"
 
-RDEPENDS_udev-hwdb += "udev-utils"
-
 FILES_udev += "${base_sbindir}/udevd \
                ${rootlibexecdir}/systemd/systemd-udevd \
                ${rootlibexecdir}/udev/accelerometer \
@@ -285,10 +282,10 @@ FILES_udev += "${base_sbindir}/udevd \
                ${sysconfdir}/init.d/systemd-udevd \
                ${systemd_unitdir}/system/*udev* \
                ${systemd_unitdir}/system/*.wants/*udev* \
+               ${base_bindir}/udevadm \
+               ${datadir}/bash-completion/completions/udevadm \
               "
 
-FILES_udev-utils = "${base_bindir}/udevadm ${datadir}/bash-completion/completions/udevadm"
-
 FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d"
 
 INITSCRIPT_PACKAGES = "udev"
-- 
1.7.9.5

[PATCH 3/3] initramfs-framework: get rid of udev-utils

[Chen Qi]

Now that udev-utils package has been removed and 'udevadm' has been
moved to udev package, the initramfs-framework should also get rid
of the udev-utils package.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../initrdscripts/initramfs-framework_1.0.bb       |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 861bec3..403127b 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -47,7 +47,7 @@ RDEPENDS_initramfs-module-mdev = "${PN}-base"
 FILES_initramfs-module-mdev = "/init.d/01-mdev"
 
 SUMMARY_initramfs-module-udev = "initramfs support for udev"
-RDEPENDS_initramfs-module-udev = "${PN}-base udev udev-utils"
+RDEPENDS_initramfs-module-udev = "${PN}-base udev"
 FILES_initramfs-module-udev = "/init.d/01-udev"
 
 SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems"
-- 
1.7.9.5