udev: regroup overrides for Zaurus devices

* device cache still disabled by default
* extend mount.blacklist to all insertable media
* add /dev/mmcblk* and /dev/sd*
* let /dev/hd* for compatibility with deprecated IDE driver
* bump INC_PR

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>

31 files changed, 39 insertions, 82 deletions

diff --git a/recipes/udev/udev-124/akita/default b/recipes/udev/files/akita/default
index d0050b873c..d0050b873c 100644
--- a/recipes/udev/udev-124/akita/default
+++ b/recipes/udev/files/akita/default
diff --git a/recipes/udev/files/akita/mount.blacklist b/recipes/udev/files/akita/mount.blacklist
index 7e351bc988..3f7b52715b 100644
--- a/recipes/udev/files/akita/mount.blacklist
+++ b/recipes/udev/files/akita/mount.blacklist
@@ -1,6 +1,9 @@
 # This is a grep pattern matched against the device name
 # Any matched pattern will _not_ be mounted / removed by udevd
 
-/dev/mtdblock
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
+/dev/mtdblock
+/dev/mmcblk
+/dev/hd
+/dev/sd
diff --git a/recipes/udev/udev-124/c7x0/default b/recipes/udev/files/c7x0/default
index d0050b873c..d0050b873c 100644
--- a/recipes/udev/udev-124/c7x0/default
+++ b/recipes/udev/files/c7x0/default
diff --git a/recipes/udev/files/c7x0/mount.blacklist b/recipes/udev/files/c7x0/mount.blacklist
index 7e351bc988..3f7b52715b 100644
--- a/recipes/udev/files/c7x0/mount.blacklist
+++ b/recipes/udev/files/c7x0/mount.blacklist
@@ -1,6 +1,9 @@
 # This is a grep pattern matched against the device name
 # Any matched pattern will _not_ be mounted / removed by udevd
 
-/dev/mtdblock
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
+/dev/mtdblock
+/dev/mmcblk
+/dev/hd
+/dev/sd
diff --git a/recipes/udev/udev-124/spitz/default b/recipes/udev/files/collie/default
index d0050b873c..d0050b873c 100644
--- a/recipes/udev/udev-124/spitz/default
+++ b/recipes/udev/files/collie/default
diff --git a/recipes/udev/files/collie/mount.blacklist b/recipes/udev/files/collie/mount.blacklist
new file mode 100644
index 0000000000..3f7b52715b
--- /dev/null
+++ b/recipes/udev/files/collie/mount.blacklist
@@ -0,0 +1,9 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/loop
+/dev/ram
+/dev/mtdblock
+/dev/mmcblk
+/dev/hd
+/dev/sd
diff --git a/recipes/udev/udev-124/tosa/default b/recipes/udev/files/poodle/default
index d0050b873c..d0050b873c 100644
--- a/recipes/udev/udev-124/tosa/default
+++ b/recipes/udev/files/poodle/default
diff --git a/recipes/udev/files/poodle/mount.blacklist b/recipes/udev/files/poodle/mount.blacklist
new file mode 100644
index 0000000000..3f7b52715b
--- /dev/null
+++ b/recipes/udev/files/poodle/mount.blacklist
@@ -0,0 +1,9 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/loop
+/dev/ram
+/dev/mtdblock
+/dev/mmcblk
+/dev/hd
+/dev/sd
diff --git a/recipes/udev/udev-141/akita/default b/recipes/udev/files/spitz/default
index d0050b873c..d0050b873c 100644
--- a/recipes/udev/udev-141/akita/default
+++ b/recipes/udev/files/spitz/default
diff --git a/recipes/udev/files/spitz/mount.blacklist b/recipes/udev/files/spitz/mount.blacklist
index 38c7aa4b32..3f7b52715b 100644
--- a/recipes/udev/files/spitz/mount.blacklist
+++ b/recipes/udev/files/spitz/mount.blacklist
@@ -1,7 +1,9 @@
 # This is a grep pattern matched against the device name
 # Any matched pattern will _not_ be mounted / removed by udevd
 
-/dev/mtdblock
-/dev/hda
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
+/dev/mtdblock
+/dev/mmcblk
+/dev/hd
+/dev/sd
diff --git a/recipes/udev/udev-141/c7x0/default b/recipes/udev/files/tosa/default
index d0050b873c..d0050b873c 100644
--- a/recipes/udev/udev-141/c7x0/default
+++ b/recipes/udev/files/tosa/default
diff --git a/recipes/udev/files/tosa/mount.blacklist b/recipes/udev/files/tosa/mount.blacklist
index 7e351bc988..3f7b52715b 100644
--- a/recipes/udev/files/tosa/mount.blacklist
+++ b/recipes/udev/files/tosa/mount.blacklist
@@ -1,6 +1,9 @@
 # This is a grep pattern matched against the device name
 # Any matched pattern will _not_ be mounted / removed by udevd
 
-/dev/mtdblock
 /dev/loop
-/dev/ram
\ No newline at end of file
+/dev/ram
+/dev/mtdblock
+/dev/mmcblk
+/dev/hd
+/dev/sd
diff --git a/recipes/udev/udev-141/spitz/default b/recipes/udev/udev-141/spitz/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-141/spitz/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-141/tosa/default b/recipes/udev/udev-141/tosa/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-141/tosa/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-151/akita/default b/recipes/udev/udev-151/akita/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-151/akita/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-151/c7x0/default b/recipes/udev/udev-151/c7x0/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-151/c7x0/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-151/spitz/default b/recipes/udev/udev-151/spitz/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-151/spitz/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-151/tosa/default b/recipes/udev/udev-151/tosa/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-151/tosa/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/akita/default b/recipes/udev/udev-154/akita/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-154/akita/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/c7x0/default b/recipes/udev/udev-154/c7x0/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-154/c7x0/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/spitz/default b/recipes/udev/udev-154/spitz/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-154/spitz/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-154/tosa/default b/recipes/udev/udev-154/tosa/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-154/tosa/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-162/akita/default b/recipes/udev/udev-162/akita/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-162/akita/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-162/c7x0/default b/recipes/udev/udev-162/c7x0/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-162/c7x0/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-162/spitz/default b/recipes/udev/udev-162/spitz/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-162/spitz/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-162/tosa/default b/recipes/udev/udev-162/tosa/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-162/tosa/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-165/akita/default b/recipes/udev/udev-165/akita/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-165/akita/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-165/c7x0/default b/recipes/udev/udev-165/c7x0/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-165/c7x0/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-165/spitz/default b/recipes/udev/udev-165/spitz/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-165/spitz/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-165/tosa/default b/recipes/udev/udev-165/tosa/default
deleted file mode 100644
index d0050b873c..0000000000
--- a/recipes/udev/udev-165/tosa/default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc
index 79f43dcc4d..6b4279d92d 100644
--- a/recipes/udev/udev.inc
+++ b/recipes/udev/udev.inc
@@ -14,7 +14,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://init \
 	   file://udev-compat-wrapper-patch"
 
-INC_PR = "r30"
+INC_PR = "r31"
 
 inherit update-rc.d autotools pkgconfig