udev: Modify init script to use the correct path of udevadm
PATCH 1/3 udev: Modify init script to use the correct path of udevadm
udevadm is installed in /usr/bin not in /usr/sbin. Init script modified accordingly.
Signed-off-by Andrei Gherzan <[email protected]>
--- meta/recipes-core/udev/udev/init | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-core/udev/udev/init +5 -5
@@ -73,13 +73,13 @@ case "$1" in echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug /lib/udev/udevd -d - /usr/sbin/udevadm control --env=STARTUP=1 + /usr/bin/udevadm control --env=STARTUP=1 if [ "$not_first_boot" != "" ];then - /usr/sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform - (/usr/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)& + /usr/bin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform + (/usr/bin/udevadm settle --timeout=3; /usr/bin/udevadm control --env=STARTUP=)& else - /usr/sbin/udevadm trigger --action=add - /usr/sbin/udevadm settle + /usr/bin/udevadm trigger --action=add + /usr/bin/udevadm settle fi ;; stop)
Signature · 1 line
1.7.9.5
PATCH 2/3 udev: Cleanup .inc file
* udev-acl and udev-concolekit have no files so remove these packages
* there's nothing in sbindir so remove useless sbindir = "${base_sbindir}"
* there is no udevinfo or udevtest so remove these from udev-utils
* udevadm is installed in bindir so modify it's path in FILES_udev-utils
Signed-off-by Andrei Gherzan <[email protected]>
--- meta/recipes-core/udev/udev.inc | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
meta/recipes-core/udev/udev.inc +4 -11
@@ -31,9 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ inherit autotools pkgconfig update-rc.d -# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/ -sbindir = "${base_sbindir}" -libexecdir = "${base_libdir}" +libexecdir = "${base_libdir}" EXTRA_OECONF = "--disable-introspection \ --with-rootlibdir=${base_libdir} \ --with-pci-ids-path=${datadir}/pci.ids \
@@ -46,8 +44,8 @@ EXTRA_OECONF = "--disable-introspection \ --with-rootprefix= \ " -PACKAGES =+ "udev-acl udev-consolekit udev-utils" -PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg" +PACKAGES =+ "udev-utils udev-cache" +PACKAGES =+ "libudev libudev-dev libudev-dbg" PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" INITSCRIPT_PACKAGES = "udev udev-cache"
@@ -73,12 +71,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-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules" - -FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm" - -RDEPENDS_udev-consolekit += "udev-acl" -FILES_udev-consolekit = "${libdir}/ConsoleKit" +FILES_udev-utils = "${bindir}/udevadm" do_install_append () { install -d ${D}${sysconfdir}/init.d
Signature · 1 line
1.7.9.5
PATCH 3/3 udev: PR bump
In reply to Andrei GherzanSigned-off-by Andrei Gherzan <[email protected]>
--- meta/recipes-core/udev/udev_182.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/udev/udev_182.bb +1 -1
@@ -1,6 +1,6 @@ include udev.inc -PR = "r5" +PR = "r6" # module-init-tools from kmod_git will provide libkmod runtime DEPENDS += "module-init-tools"
Signature · 1 line
1.7.9.5