summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/udev
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 13:51:48 +0100
commit9bb5c7472958aeea46225e835f44d45bea7f7351 (patch)
tree995d07bdff87c00c162689b5851fb2a0e19af7e0 /meta/recipes-core/udev
parent2ecb89961b33c6315a3c46262e58b70329a0ab91 (diff)
downloadpoky-9bb5c7472958aeea46225e835f44d45bea7f7351.tar.gz
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] (From OE-Core rev: 4814a7a85ccff74923a554bdc11820fceff84e2e) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev')
-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 \
47 --without-systemdsystemunitdir \ 47 --without-systemdsystemunitdir \
48 " 48 "
49 49
50PACKAGES =+ "udev-utils udev-cache" 50PACKAGES =+ "udev-cache"
51PACKAGES =+ "libudev" 51PACKAGES =+ "libudev"
52PACKAGES =+ "libgudev" 52PACKAGES =+ "libgudev"
53 53
@@ -57,8 +57,8 @@ INITSCRIPT_PARAMS_udev = "start 04 S ."
57INITSCRIPT_NAME_udev-cache = "udev-cache" 57INITSCRIPT_NAME_udev-cache = "udev-cache"
58INITSCRIPT_PARAMS_udev-cache = "start 36 S ." 58INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
59 59
60FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev" 60FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev ${bindir}/udevadm"
61RRECOMMENDS_${PN} += "udev-utils udev-cache" 61RRECOMMENDS_${PN} += "udev-cache"
62 62
63FILES_${PN}-dbg += "${libexecdir}/.debug" 63FILES_${PN}-dbg += "${libexecdir}/.debug"
64FILES_${PN}-dbg += "${base_libdir}/udev/.debug/" 64FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
@@ -73,8 +73,6 @@ FILES_libudev = "${base_libdir}/libudev.so.*"
73FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*" 73FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
74FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" 74FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
75 75
76FILES_udev-utils = "${bindir}/udevadm"
77
78do_install_append () { 76do_install_append () {
79 install -d ${D}${sysconfdir}/init.d 77 install -d ${D}${sysconfdir}/init.d
80 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 78 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev