summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-06-18 10:38:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 11:49:40 +0100
commit4814a7a85ccff74923a554bdc11820fceff84e2e (patch)
tree163229919c24dde04d4c32051d82e5ac756048c2
parent6aae37c66fb6e7153b829ad860b7e7f94e804bd4 (diff)
downloadopenembedded-core-contrib-4814a7a85ccff74923a554bdc11820fceff84e2e.tar.gz
openembedded-core-contrib-4814a7a85ccff74923a554bdc11820fceff84e2e.tar.bz2
openembedded-core-contrib-4814a7a85ccff74923a554bdc11820fceff84e2e.zip
udev: remove udev-utils, add 'udevadm' to udev package
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/udev/udev.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index f9d544e86a..11204aaa41 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