summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-20 14:01:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:28 +0000
commitb5d6121bbb1186a1c36a29091f82501d3af6888a (patch)
tree8f621bf260604c050cc84080db3349c110f95ee3 /meta/recipes-core
parentd97d07c5ef0430753759449f2e2bd2ba1c0ff0f1 (diff)
downloadast2050-yocto-poky-b5d6121bbb1186a1c36a29091f82501d3af6888a.zip
ast2050-yocto-poky-b5d6121bbb1186a1c36a29091f82501d3af6888a.tar.gz
udev: skip mounting /dev on tmpfs if it is on devtmpfs
(From OE-Core rev: 08b2bb292ec9da38e399fe4fe00da5cc0ee0ea4c) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/udev/udev/init2
-rw-r--r--meta/recipes-core/udev/udev_164.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index edc3c9a..d0d7e5d 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -28,7 +28,7 @@ export ACTION=add
echo -n "Starting udev"
# mount the tmpfs on /dev, if not already done
-LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+LANG=C awk '$2 == "/dev" && ($3 == "tmpfs" || $3 == "devtmpfs") { exit 1 }' /proc/mounts && {
mount -n -o mode=0755 -t tmpfs none "/dev"
mkdir -m 0755 /dev/pts
mkdir -m 1777 /dev/shm
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 3e4e402..f952c90 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
include udev.inc
-PR = "r7"
+PR = "r8"
SRC_URI += "file://udev-166-v4l1-1.patch"
OpenPOWER on IntegriCloud