udev-extraconf: Merge with udev-extra-rules from meta-oe

* Move parts of local.rules from udev to udev-extraconf
* Move mount.sh and network.sh to udev-extraconf along with rule fragments
* Add mount.blacklist to CONFFILES
* Change PV to 1.0 and bump PR to provide upgrade path from meta-oe's udev-extra-rules
  including RREPLACE/RPROVIDES/RCONFLICTS trio

(From OE-Core rev: 0ca3a7823e97c4e4af6e89d852f98d29ed6193d7)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 68 deletions

diff --git a/meta/recipes-core/udev/udev/mount.sh b/meta/recipes-core/udev/udev/mount.sh
deleted file mode 100644
index c13b8bbb3b..0000000000
--- a/meta/recipes-core/udev/udev/mount.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-# Called from udev
-#
-# Attempt to mount any added block devices and umount any removed devices
-
-
-MOUNT="/bin/mount"
-PMOUNT="/usr/bin/pmount"
-UMOUNT="/bin/umount"
-
-for line in `cat /etc/udev/mount.blacklist`
-do
-        if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
-        then
-                logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
-                exit 0
-        fi
-done
-
-automount() {   
-        name="`basename "$DEVNAME"`"
-
-        ! test -d "/media/$name" && mkdir -p "/media/$name"
-        
-        if ! $MOUNT -t auto $DEVNAME "/media/$name"
-        then
-                #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
-                rm_dir "/media/$name"
-        else
-                logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
-                touch "/tmp/.automount-$name"
-        fi
-}
-        
-rm_dir() {
-        # We do not want to rm -r populated directories
-        if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
-        then
-                ! test -z "$1" && rm -r "$1"
-        else
-                logger "mount.sh/automount" "Not removing non-empty directory [$1]"
-        fi
-}
-
-if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
-        if [ -x "$PMOUNT" ]; then
-                $PMOUNT $DEVNAME 2> /dev/null
-        elif [ -x $MOUNT ]; then
-                $MOUNT $DEVNAME 2> /dev/null
-        fi
-        
-        # If the device isn't mounted at this point, it isn't configured in fstab
-        grep -q "^$DEVNAME " /proc/mounts || automount
-fi
-
-
-
-if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
-        for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
-        do
-                $UMOUNT $mnt
-        done
-        
-        # Remove empty directories from auto-mounter
-        name="`basename "$DEVNAME"`"
-        test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
-fi