summaryrefslogtreecommitdiff
path: root/openembedded/packages/udev
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
committerRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
commitcbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch)
treef7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/packages/udev
parent562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff)
downloadopenembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.xz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/udev')
-rwxr-xr-xopenembedded/packages/udev/files/init4
-rw-r--r--openembedded/packages/udev/files/udev.rules2
-rw-r--r--openembedded/packages/udev/udev_070.bb2
3 files changed, 6 insertions, 2 deletions
diff --git a/openembedded/packages/udev/files/init b/openembedded/packages/udev/files/init
index c290661c7..6ad6fd581 100755
--- a/openembedded/packages/udev/files/init
+++ b/openembedded/packages/udev/files/init
@@ -52,7 +52,9 @@ mount_tmpfs() {
mkdir -p /dev/.static/dev
chmod 700 /dev/.static/
- mount -n -o move /etc/udev /dev/.static/dev
+ # Make sure it's busybox mount we're using. util-linux mount doesn't handle
+ # -o move.
+ busybox mount -n -o move /etc/udev /dev/.static/dev
}
# I hate this hack. -- Md
diff --git a/openembedded/packages/udev/files/udev.rules b/openembedded/packages/udev/files/udev.rules
index 4fc82ba25..044ababa7 100644
--- a/openembedded/packages/udev/files/udev.rules
+++ b/openembedded/packages/udev/files/udev.rules
@@ -54,6 +54,8 @@ KERNEL=="issm*", NAME="infiniband/%k"
KERNEL=="uverbs*", NAME="infiniband/%k"
KERNEL=="ucm", NAME="infiniband/%k"
+KERNEL=="buzzer", NAME="misc/buzzer"
+
# ALSA devices
KERNEL=="controlC[0-9]*", NAME="snd/%k"
KERNEL=="hwC[D0-9]*", NAME="snd/%k"
diff --git a/openembedded/packages/udev/udev_070.bb b/openembedded/packages/udev/udev_070.bb
index dfc20eb5b..e5f0409b1 100644
--- a/openembedded/packages/udev/udev_070.bb
+++ b/openembedded/packages/udev/udev_070.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
include udev.inc
-PR = "r3"
+PR = "r5"
UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"