summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-04-09 09:08:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-09 18:09:14 +0100
commit307e860860badd4420a01ed781c6c845fc9bf603 (patch)
tree4642c7ec1157873c30139274ddcf13529146f01e
parentf6ae87e838685bd28c44512b3fd97bc5ad8127a7 (diff)
downloadpoky-307e860860badd4420a01ed781c6c845fc9bf603.tar.gz
udev: fix init script for the location of udevd
Ensure we can update the script base don the location of the udevd installation (From OE-Core rev: 25ff5960e41b9d7c62b05a08dd77cf11390962a1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/udev/udev.inc2
-rw-r--r--meta/recipes-core/udev/udev/init4
-rw-r--r--meta/recipes-core/udev/udev/udev-cache2
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index c4d2ce4c7d..d025458947 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -79,6 +79,8 @@ do_install_append () {
79 install -d ${D}${sysconfdir}/init.d 79 install -d ${D}${sysconfdir}/init.d
80 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 80 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
81 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache 81 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
82 sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev
83 sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev-cache
82 84
83 install -d ${D}${sysconfdir}/default 85 install -d ${D}${sysconfdir}/default
84 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache 86 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index 95d2672be8..37b52312e2 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -15,7 +15,7 @@ export TZ=/etc/localtime
15 15
16[ -d /sys/class ] || exit 1 16[ -d /sys/class ] || exit 1
17[ -r /proc/mounts ] || exit 1 17[ -r /proc/mounts ] || exit 1
18[ -x /lib/udev/udevd ] || exit 1 18[ -x @UDEVD@ ] || exit 1
19[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache 19[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
20[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf 20[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
21 21
@@ -71,7 +71,7 @@ case "$1" in
71 71
72 # trigger the sorted events 72 # trigger the sorted events
73 echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug 73 echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
74 /lib/udev/udevd -d 74 @UDEVD@ -d
75 75
76 /usr/bin/udevadm control --env=STARTUP=1 76 /usr/bin/udevadm control --env=STARTUP=1
77 if [ "$not_first_boot" != "" ];then 77 if [ "$not_first_boot" != "" ];then
diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache
index 0f3d7cd3f3..01fec6e96e 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/meta/recipes-core/udev/udev/udev-cache
@@ -12,7 +12,7 @@
12export TZ=/etc/localtime 12export TZ=/etc/localtime
13 13
14[ -r /proc/mounts ] || exit 1 14[ -r /proc/mounts ] || exit 1
15[ -x /lib/udev/udevd ] || exit 1 15[ -x @UDEVD@ ] || exit 1
16[ -d /sys/class ] || exit 1 16[ -d /sys/class ] || exit 1
17 17
18[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache 18[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache