From: Chen Qi <qi.c...@windriver.com>
As udev's init script needs udevadm, we should make udev RDEPEND on
udev-utils instead of just recommends it.
Also, move udevadm from /usr/bin to /bin. The purpose is to make udev
start correctly even if /usr is missing.
This patch also takes into consideration the situation of ${bindir}
and ${base_bindir} being the same.
Signed-off-by: Chen Qi <qi.c...@windriver.com>
---
meta/recipes-core/udev/udev.inc | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 02cab3b..7667a79 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -55,7 +55,8 @@ 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"
+RRECOMMENDS_${PN} += "udev-cache"
+RDEPENDS_${PN} += "udev-utils"
FILES_${PN}-dbg += "${libexecdir}/.debug"
FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
@@ -72,7 +73,7 @@ FILES_libgudev-dev = "${includedir}/gudev*
${libdir}/libgudev*.so ${libdir}/libg
${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
FILES_udev-cache = "${sysconfdir}/init.d/udev-cache
${sysconfdir}/default/udev-cache"
-FILES_udev-utils = "${bindir}/udevadm"
+FILES_udev-utils = "${base_bindir}/udevadm"
do_install_append () {
install -d ${D}${sysconfdir}/init.d
@@ -87,9 +88,14 @@ do_install_append () {
touch ${D}${sysconfdir}/udev/cache.data
install -d ${D}${sysconfdir}/udev/rules.d/
-
install -m 0644 ${WORKDIR}/local.rules
${D}${sysconfdir}/udev/rules.d/local.rules
+ if [ "${bindir}" != "${base_bindir}" ]; then
+ install -d ${D}${base_bindir}
+ mv ${D}${bindir}/udevadm ${D}${base_bindir}/udevadm
+ rmdir ${D}${bindir}
+ fi
+
# hid2hci has moved to bluez4. removed in udev as of version 169
rm -f ${D}${base_libdir}/udev/hid2hci
--
1.7.9.5
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
