Ensure we can update the script base don the location of the udevd installation
Signed-off-by: Saul Wold <s...@linux.intel.com>
---
meta/recipes-core/udev/udev.inc | 2 ++
meta/recipes-core/udev/udev/init | 4 ++--
meta/recipes-core/udev/udev/udev-cache | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index c4d2ce4..d025458 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -79,6 +79,8 @@ do_install_append () {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
install -m 0755 ${WORKDIR}/udev-cache
${D}${sysconfdir}/init.d/udev-cache
+ sed -i s%@UDEVD@%${base_sbindir}/udev/udevd%
${D}${sysconfdir}/init.d/udev
+ sed -i s%@UDEVD@%${base_sbindir}/udev/udevd%
${D}${sysconfdir}/init.d/udev-cache
install -d ${D}${sysconfdir}/default
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 95d2672..37b5231 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -15,7 +15,7 @@ export TZ=/etc/localtime
[ -d /sys/class ] || exit 1
[ -r /proc/mounts ] || exit 1
-[ -x /lib/udev/udevd ] || exit 1
+[ -x @UDEVD@ ] || exit 1
[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
@@ -71,7 +71,7 @@ case "$1" in
# trigger the sorted events
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
- /lib/udev/udevd -d
+ @UDEVD@ -d
/usr/bin/udevadm control --env=STARTUP=1
if [ "$not_first_boot" != "" ];then
diff --git a/meta/recipes-core/udev/udev/udev-cache
b/meta/recipes-core/udev/udev/udev-cache
index 0f3d7cd..01fec6e 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/meta/recipes-core/udev/udev/udev-cache
@@ -12,7 +12,7 @@
export TZ=/etc/localtime
[ -r /proc/mounts ] || exit 1
-[ -x /lib/udev/udevd ] || exit 1
+[ -x @UDEVD@ ] || exit 1
[ -d /sys/class ] || exit 1
[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
--
1.8.0.2
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
