[udev] Update to 182.
authorhschang <chang@dev3>
Mon, 22 Dec 2014 10:09:58 +0000 (19:09 +0900)
committerhschang <chang@dev3>
Mon, 22 Dec 2014 10:09:58 +0000 (19:09 +0900)
27 files changed:
meta-openvuplus/conf/distro/vuplus.conf
meta-openvuplus/recipes-core/udev/udev-124/40-od-devfs-compatibility.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/41-od-linux-2.6.18-misc.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/42-od-oled-compatibility.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/default [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/devfs-udev.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/flags.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/init [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/libvolume-id-soname.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/links.conf [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/local.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/mount.blacklist [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/mount.sh [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/mtd-exclude-persistent.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/network.sh [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/noasmlinkage.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/permissions.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/run.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/series [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/udev.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/vol_id_ld.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-182/99_vuplus.rules [new file with mode: 0644]
meta-openvuplus/recipes-core/udev/udev-182/init [new file with mode: 0644]
meta-openvuplus/recipes-core/udev/udev_124.bb [deleted file]
meta-openvuplus/recipes-core/udev/udev_124.inc [deleted file]
meta-openvuplus/recipes-core/udev/udev_182.bbappend [new file with mode: 0644]

index 53f168f..457819d 100644 (file)
@@ -19,7 +19,8 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages needed if opkg is used
 DISTRO_FEED_PREFIX ?= "official"
 
 # extra packages needed if opkg is used
 DISTRO_FEED_PREFIX ?= "official"
-DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
+#DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
+DISTRO_FEED_URI = "http://192.168.102.71/feeds/oe30"
 EXTRAOPKGCONFIG = "distro-feed-configs"
 
 # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
 EXTRAOPKGCONFIG = "distro-feed-configs"
 
 # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -34,15 +35,11 @@ PREFERRED_VERSION_pango ?= "1.28.4"
 
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
 
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
-#PREFERRED_VERSION_linux-libc-headers = "3.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1"
-#PREFERRED_VERSION_linux-libc-headers = "3.1.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1.1"
 
 PREFERRED_VERSION_freetype ?= "2.4.12"
 
 # chang : udev_182 is not working with linux-libc-headers_2.6.31.
 
 PREFERRED_VERSION_freetype ?= "2.4.12"
 
 # chang : udev_182 is not working with linux-libc-headers_2.6.31.
-PREFERRED_VERSION_udev ?= "124"
+#PREFERRED_VERSION_udev ?= "124"
 
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
 
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/40-od-devfs-compatibility.rules b/meta-openvuplus/recipes-core/udev/udev-124/40-od-devfs-compatibility.rules
deleted file mode 100644 (file)
index 4499cf1..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-KERNEL=="i2c-[0-9]*",          SYMLINK+="i2c/%n"
-KERNEL=="fb[0-9]*",            SYMLINK+="fb/%n"
-KERNEL=="mtdblock[0-9]*",      SYMLINK+="mtdblock/%n"
-KERNEL=="tty[0-9]*",           SYMLINK+="vc/%n"
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/41-od-linux-2.6.18-misc.rules b/meta-openvuplus/recipes-core/udev/udev-124/41-od-linux-2.6.18-misc.rules
deleted file mode 100644 (file)
index 4a7e72f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-KERNEL=="fp0",                 NAME="dbox/fp0"
-KERNEL=="oled0",               NAME="dbox/oled0"
-KERNEL=="lcd0",                        NAME="dbox/lcd0"
-KERNEL=="hsm0",                        NAME="misc/hsm0"
-KERNEL=="vtuner0",             NAME="misc/vtuner0"
-KERNEL=="vtuner1",             NAME="misc/vtuner1"
-KERNEL=="vtuner2",             NAME="misc/vtuner2"
-KERNEL=="vtuner3",             NAME="misc/vtuner3"
-KERNEL=="pvr",                 NAME="misc/pvr"
-KERNEL=="dp",                  NAME="misc/dp"
-KERNEL=="ni2c",                 NAME="misc/ni2c"
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/42-od-oled-compatibility.rules b/meta-openvuplus/recipes-core/udev/udev-124/42-od-oled-compatibility.rules
deleted file mode 100644 (file)
index bf501bf..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-KERNEL=="*oled0",              SYMLINK+="dbox/lcd0"
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/default b/meta-openvuplus/recipes-core/udev/udev-124/default
deleted file mode 100755 (executable)
index d0050b8..0000000
+++ /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/meta-openvuplus/recipes-core/udev/udev-124/devfs-udev.rules b/meta-openvuplus/recipes-core/udev/udev-124/devfs-udev.rules
deleted file mode 100644 (file)
index 0ba1ad4..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-# The use of these rules is not recommended or supported.
-# In a world where devices can come and go at any time, the devfs scheme
-# of simple device enumeration does not help _anything_. Just forget about
-# it. Use custom rules to name your device or look at the persistent device
-# naming scheme, which is implemented for disks and add your subsystem.
-
-# ide block devices
-BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
-
-# md block devices
-KERNEL="md[0-9]*", NAME="md/%n"
-
-# floppy devices
-KERNEL="fd[0-9]*", NAME="floppy/%n"
-
-# tty devices
-KERNEL="tty[0-9]*",    NAME="vc/%n", SYMLINK="%k"
-KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k"
-KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
-
-# vc devices
-KERNEL="vcs",        NAME="vcc/0"
-KERNEL="vcs[0-9]*",  NAME="vcc/%n"
-KERNEL="vcsa",       NAME="vcc/a0"
-KERNEL="vcsa[0-9]*", NAME="vcc/a%n"
-
-# v4l devices
-KERNEL="video[0-9]*", NAME="v4l/video%n"
-KERNEL="radio[0-9]*", NAME="v4l/radio%n"
-KERNEL="vbi[0-9]*",   NAME="v4l/vbi%n"
-KERNEL="vtx[0-9]*",   NAME="v4l/vtx%n"
-
-# dm devices (ignore them)
-KERNEL="dm-[0-9]*", NAME=""
-
-# i2c devices
-KERNEL="i2c-[0-9]*", NAME="i2c/%n", SYMLINK="%k"
-
-# loop devices
-KERNEL="loop[0-9]*", NAME="loop/%n", SYMLINK="%k"
-
-# ramdisks
-KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
-
-# framebuffer devices
-KERNEL="fb[0-9]*", NAME="fb/%n", SYMLINK="%k"
-
-# misc
-KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="agpgart", NAME="misc/%k", SYMLINK="%k"
-KERNEL="rtc",     NAME="misc/%k", SYMLINK="%k"
-KERNEL="psaux",   NAME="misc/%k", SYMLINK="%k"
-KERNEL="uinput",  NAME="misc/%k", SYMLINK="%k"
-
-# alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*",     NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
-KERNEL="midi[CD0-9]*",   NAME="snd/%k"
-KERNEL="timer",          NAME="snd/%k"
-KERNEL="seq",            NAME="snd/%k"
-
-# oss devices
-KERNEL="audio*",     NAME="sound/%k", SYMLINK="%k"
-KERNEL="dmmidi",     NAME="sound/%k", SYMLINK="%k"
-KERNEL="dsp*",       NAME="sound/%k", SYMLINK="%k"
-KERNEL="midi*",      NAME="sound/%k", SYMLINK="%k"
-KERNEL="mixer*",     NAME="sound/%k", SYMLINK="%k"
-KERNEL="sequencer*", NAME="sound/%k", SYMLINK="%k"
-
-# input devices
-KERNEL="mice",   NAME="input/%k"
-KERNEL="mouse*", NAME="input/%k"
-KERNEL="event*", NAME="input/%k"
-KERNEL="js*",    NAME="input/%k"
-KERNEL="ts*",   NAME="input/%k"
-
-# USB devices
-KERNEL="hiddev*",      NAME="usb/%k"
-KERNEL="auer*",                NAME="usb/%k"
-KERNEL="legousbtower*",        NAME="usb/%k"
-KERNEL="dabusb*",      NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k"
-
-# netlink devices
-KERNEL="route",                NAME="netlink/%k"
-KERNEL="skip",         NAME="netlink/%k"
-KERNEL="usersock",     NAME="netlink/%k"
-KERNEL="fwmonitor",    NAME="netlink/%k"
-KERNEL="tcpdiag",      NAME="netlink/%k"
-KERNEL="nflog",                NAME="netlink/%k"
-KERNEL="xfrm",         NAME="netlink/%k"
-KERNEL="arpd",         NAME="netlink/%k"
-KERNEL="route6",       NAME="netlink/%k"
-KERNEL="ip6_fw",       NAME="netlink/%k"
-KERNEL="dnrtmsg",      NAME="netlink/%k"
-KERNEL="tap*",         NAME="netlink/%k"
-
-# CAPI devices
-KERNEL="capi",         NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi*",                NAME="capi/%n"
-
-# Network devices
-KERNEL="tun",          NAME="net/%k"
-
-# raw devices
-KERNEL="raw[0-9]*",     NAME="raw/%k" 
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/flags.patch b/meta-openvuplus/recipes-core/udev/udev-124/flags.patch
deleted file mode 100644 (file)
index 13f20eb..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
----
- Makefile |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: udev-115/Makefile
-===================================================================
---- udev-115.orig/Makefile     2007-08-24 01:29:54.000000000 +0200
-+++ udev-115/Makefile  2007-09-20 17:21:45.000000000 +0200
-@@ -112,39 +112,39 @@
- AR = $(CROSS_COMPILE)ar
- RANLIB = $(CROSS_COMPILE)ranlib
--CFLAGS                += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-+override CFLAGS       = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
- WARNINGS      = -Wstrict-prototypes -Wsign-compare -Wshadow \
-                 -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
-                 -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
--CFLAGS                += $(WARNINGS)
-+override CFLAGS       += $(WARNINGS)
- LDFLAGS += -Wl,-warn-common,--as-needed
- OPTFLAGS = -Os
--CFLAGS += $(OPTFLAGS)
-+override CFLAGS += $(OPTFLAGS)
- ifeq ($(strip $(USE_LOG)),true)
--      CFLAGS += -DUSE_LOG
-+      override CFLAGS += -DUSE_LOG
- endif
- # if DEBUG is enabled, then we do not strip
- ifeq ($(strip $(DEBUG)),true)
--      CFLAGS  += -DDEBUG
-+      override CFLAGS  += -DDEBUG
- endif
- ifeq ($(strip $(USE_GCOV)),true)
--      CFLAGS += -fprofile-arcs -ftest-coverage
-+      override CFLAGS += -fprofile-arcs -ftest-coverage
-       LDFLAGS += -fprofile-arcs
- endif
- ifeq ($(strip $(USE_SELINUX)),true)
-       UDEV_OBJS += udev_selinux.o
-       LIB_OBJS += -lselinux -lsepol
--      CFLAGS += -DUSE_SELINUX
-+      override CFLAGS += -DUSE_SELINUX
- endif
- ifeq ($(strip $(USE_STATIC)),true)
--      CFLAGS += -DUSE_STATIC
-+      override CFLAGS += -DUSE_STATIC
-       LDFLAGS += -static
- endif
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/init b/meta-openvuplus/recipes-core/udev/udev-124/init
deleted file mode 100755 (executable)
index e8b2cc5..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          udev
-# Required-Start:    mountkernfs
-# Required-Stop:
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Start udevd, populate /dev and load drivers.
-### END INIT INFO
-
-# This script is based on Debian's.
-
-COLDPLUG=no
-COLDPLUG_TARBALL="/lib/udev/devices.tar.gz"
-
-for x in $(cat /proc/cmdline); do
-        case $x in
-        coldplug)
-               COLDPLUG=yes
-                ;;
-        esac
-done
-
-# we need to unmount /dev/pts/ and remount it later over the tmpfs
-unmount_devpts() {
-  if mountpoint -q /dev/pts/; then
-    umount -n -l /dev/pts/
-  fi
-
-  if mountpoint -q /dev/shm/; then
-    umount -n -l /dev/shm/
-  fi
-}
-
-# mount a tmpfs over /dev, if somebody did not already do it
-mount_tmpfs() {
-  if grep -q "/dev tmpfs" /proc/mounts; then
-    return
-  fi
-
-  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs udev /dev; then
-    echo "udev requires tmpfs support, not started."
-    exit 1
-  fi
-
-  return 0
-}
-
-create_dev_makedev() {
-  if [ -e /sbin/MAKEDEV ]; then
-    ln -sf /sbin/MAKEDEV /dev/MAKEDEV
-  else
-    ln -sf /bin/true /dev/MAKEDEV
-  fi
-}
-
-make_extra_nodes() {
-  ret=1
-  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
-    cp -a /lib/udev/devices/* /$1/
-    ret=0
-  fi
-
-  [ -e /etc/udev/links.conf ] || return $ret
-
-  grep '^[^#]' /etc/udev/links.conf | \
-  while read type name arg1; do
-    [ "$type" -a "$name" -a ! -e "/$1/$name" -a ! -L "/$1/$name" ] || continue
-    case "$type" in
-      L) ln -s $arg1 /$1/$name ;;
-      D) mkdir -p /$1/$name ;;
-      M) mknod -m 600 /$1/$name $arg1 ;;
-      *) echo "links.conf: unparseable line ($type $name $arg1)" >&2 ;;
-    esac
-  done
-
-  return $ret
-}
-
-##############################################################################
-
-[ -x /sbin/udevd ] || exit 0
-
-PATH="/sbin:/bin"
-
-# defaults
-tmpfs_size="2M"
-udev_root="/dev"
-
-if [ -e /etc/udev/udev.conf ]; then
-  . /etc/udev/udev.conf
-fi
-
-##############################################################################
-
-# When modifying this script, do not forget that between the time that the
-# new /dev has been mounted and udevadm trigger has been run there will be
-# no /dev/null. This also means that you cannot use the "&" shell command.
-
-case "$1" in
-    start)
-    if [ -e "$udev_root/.udev/" ]; then
-       if mountpoint -q $udev_root/; then
-           TMPFS_MOUNTED=1
-       else
-           echo ".udev/ already exists on the static $udev_root!"
-       fi
-    fi
-
-    echo > /sys/kernel/uevent_helper
-
-    if [ -z "$TMPFS_MOUNTED" ]; then
-       unmount_devpts
-       mount_tmpfs
-    else
-       # and clean up the database of the initramfs udev
-       rm -rf /dev/.udev/
-    fi
-
-    # /dev/null must be created before udevd is started
-    if ! make_extra_nodes "$udev_root"; then
-       COLDPLUG=yes
-    fi
-    if [ ! -f "$COLDPLUG_TARBALL" ]; then
-       COLDPLUG=yes
-    fi
-
-    # if this directory is not present /dev will not be updated by udev
-    mkdir -p /dev/.udev/db/
-
-    echo "Startting the hotplug events dispatcher"
-    udevd --daemon
-
-    mkdir -p /dev/.udev/queue/ /dev/.udev/rules.d/
-
-    create_dev_makedev
-
-    if [ $COLDPLUG != "no" ]; then
-        echo "Synthesizing the initial hotplug events"
-        udevadm trigger
-
-        # wait for the udevd childs to finish
-        echo "Waiting for /dev to be fully populated"
-        if udevadm settle; then
-            echo 'done'
-        else
-            echo 'timeout'
-        fi
-    fi
-
-    ;;
-
-    stop)
-    echo "Stopping the hotplug events dispatcher"
-    start-stop-daemon --stop --name udevd --quiet --oknodo
-    ;;
-
-    restart)
-    echo "Stopping the hotplug events dispatcher"
-    start-stop-daemon --stop --name udevd --quiet --oknodo
-
-    echo "Startting the hotplug events dispatcher"
-    udevd --daemon
-    ;;
-
-    reload|force-reload)
-    udevadm control --reload_rules
-    ;;
-
-    *)
-    echo "Usage: /etc/init.d/udev {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
-
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/libvolume-id-soname.patch b/meta-openvuplus/recipes-core/udev/udev-124/libvolume-id-soname.patch
deleted file mode 100644 (file)
index 56365a4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr udev-124-orig/extras/volume_id/lib/Makefile udev-124/extras/volume_id/lib/Makefile
---- udev-124-orig/extras/volume_id/lib/Makefile        2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/volume_id/lib/Makefile     2009-01-14 23:32:42.000000000 -0500
-@@ -113,7 +113,7 @@
- ifeq ($(libdir),$(usrlibdir))
-       ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
- else
--      ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-+      ln -sf ../..$(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
- endif
-       $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
-       $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/links.conf b/meta-openvuplus/recipes-core/udev/udev-124/links.conf
deleted file mode 100644 (file)
index a9f8b58..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file does not exist. Please do not ask the debian maintainer about it.
-# You may use it to do strange and wonderful things, at your risk.
-
-L fd           /proc/self/fd
-L stdin                /proc/self/fd/0
-L stdout       /proc/self/fd/1
-L stderr       /proc/self/fd/2
-L core         /proc/kcore
-L sndstat      /proc/asound/oss/sndstat
-L MAKEDEV      /sbin/MAKEDEV
-
-D pts
-D shm
-
-M null         c   1 3
-M console      c   5 1
-
-# Hic sunt leones.
-M ppp          c 108 0
-D loop
-M loop/0       b 7 0
-D net
-M net/tun      c 10 200
-
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/local.rules b/meta-openvuplus/recipes-core/udev/udev-124/local.rules
deleted file mode 100644 (file)
index 9e0479b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Media automounting
-#SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
-#SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
-
-# Handle network interface setup
-SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
-SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
-
-# The first rtc device is symlinked to /dev/rtc
-KERNEL=="rtc0", SYMLINK+="rtc"
-
-# Try and modprobe for drivers for new hardware
-ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-
-# Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/mount.blacklist b/meta-openvuplus/recipes-core/udev/udev-124/mount.blacklist
deleted file mode 100644 (file)
index d3ebb17..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/dev/loop
-/dev/ram
-/dev/mtdblock
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/mount.sh b/meta-openvuplus/recipes-core/udev/udev-124/mount.sh
deleted file mode 100644 (file)
index be8b3df..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-# Called from udev
-# Attemp to mount any added block devices 
-# and remove any removed devices
-#
-
-MOUNT="/bin/mount"
-PMOUNT="/usr/bin/pmount"
-UMOUNT="/bin/umount"
-name="`basename "$DEVNAME"`"
-
-for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
-do
-       if ( echo "$DEVNAME" | grep -q "$line" )
-       then
-               logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
-               exit 0
-       fi
-done
-
-automount() {  
-       ! test -d "/media/$name" && mkdir -p "/media/$name"
-       
-       if ! $MOUNT -t auto -o sync $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
-       # 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by
-       #           its true device name so this would break. If the rootfs is mounted on two places
-       #           during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition
-       #           to /etc/udev/mount.blacklist via postinst 
-
-       cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || 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
-       test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
-fi
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/mtd-exclude-persistent.patch b/meta-openvuplus/recipes-core/udev/udev-124/mtd-exclude-persistent.patch
deleted file mode 100644 (file)
index 204b7b4..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
-
---- a/etc/udev/rules.d/60-persistent-storage.rules     2008-06-12 07:24:30.000000000 +0200
-+++ b/etc/udev/rules.d/60-persistent-storage.rules     2009-08-18 11:39:23.595063264 +0200
-@@ -10,7 +10,7 @@
- SUBSYSTEM!="block", GOTO="persistent_storage_end"
- # skip rules for inappropriate block devices
--KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end"
-+KERNEL=="ram*|loop*|fd*|mtd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end"
- # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
- KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/network.sh b/meta-openvuplus/recipes-core/udev/udev-124/network.sh
deleted file mode 100644 (file)
index 182c26d..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# udevd does clearenv(). Export shell PATH to children.
-export PATH
-
-# Do not run when pcmcia-cs is installed
-test -x /sbin/cardctl && exit 0
-
-# We get two "add" events for hostap cards due to wifi0
-echo "$INTERFACE" | grep -q wifi && exit 0
-
-
-# Check if /etc/init.d/network has been run yet to see if we are 
-# called by starting /etc/rcS.d/S03udev and not by hotplugging a device
-#
-# At this stage, network interfaces should not be brought up
-# automatically because:
-# a)   /etc/init.d/network has not been run yet (security issue)
-# b)   /var has not been populated yet so /etc/resolv,conf points to 
-#      oblivion, making the network unusable
-#
-
-spoofp="`grep ^spoofprotect /etc/network/options`"
-if test -z "$spoofp"
-then
-       # This is the default from /etc/init.d/network
-       spoofp_val=yes
-else
-       spoofp_val=${spoofp#spoofprotect=}
-fi
-
-test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0
-
-# I think it is safe to assume that "lo" will always be there ;)
-if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val"
-then
-       echo "$INTERFACE" >> /dev/udev_network_queue    
-       exit 0
-fi
-
-#
-# Code taken from pcmcia-cs:/etc/pcmcia/network
-#
-
-# if this interface has an entry in /etc/network/interfaces, let ifupdown
-# handle it
-if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then
-  case $ACTION in
-    add)
-       ifconfig | grep -q "^$INTERFACE" || ifup $INTERFACE
-       ;;
-    remove)
-       ifdown $INTERFACE
-       ;;
-  esac
-  
-  exit 0
-fi
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/noasmlinkage.patch b/meta-openvuplus/recipes-core/udev/udev-124/noasmlinkage.patch
deleted file mode 100644 (file)
index d58a7ea..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -pru udev-124.orig/test-udev.c udev-124/test-udev.c
---- udev-124.orig/test-udev.c  2008-06-12 06:24:30.000000000 +0100
-+++ udev-124/test-udev.c       2008-07-07 14:43:37.000000000 +0100
-@@ -46,7 +46,7 @@ void log_message(int priority, const cha
- }
- #endif
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
-       switch (signum) {
-               case SIGALRM:
-diff -pru udev-124.orig/udevd.c udev-124/udevd.c
---- udev-124.orig/udevd.c      2008-06-12 06:24:30.000000000 +0100
-+++ udev-124/udevd.c   2008-07-07 14:43:58.000000000 +0100
-@@ -87,7 +87,7 @@ void log_message(int priority, const cha
- #endif
--static void asmlinkage udev_event_sig_handler(int signum)
-+static void udev_event_sig_handler(int signum)
- {
-       if (signum == SIGALRM)
-               exit(1);
-@@ -798,7 +798,7 @@ static struct udevd_uevent_msg *get_netl
-       return msg;
- }
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
-       switch (signum) {
-               case SIGINT:
-diff -pru udev-124.orig/udevmonitor.c udev-124/udevmonitor.c
---- udev-124.orig/udevmonitor.c        2008-06-12 06:24:30.000000000 +0100
-+++ udev-124/udevmonitor.c     2008-07-07 14:44:24.000000000 +0100
-@@ -97,7 +97,7 @@ static int init_uevent_netlink_sock(void
-       return 0;
- }
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
-       if (signum == SIGINT || signum == SIGTERM)
-               udev_exit = 1;
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/permissions.rules b/meta-openvuplus/recipes-core/udev/udev-124/permissions.rules
deleted file mode 100644 (file)
index 940d163..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-ACTION!="add", GOTO="permissions_end"
-
-# workarounds needed to synchronize with sysfs
-# only needed for kernels < v2.6.18-rc1
-ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*",    WAIT_FOR_SYSFS="ioerr_cnt"
-# only needed for kernels < 2.6.16
-SUBSYSTEM=="net",                              WAIT_FOR_SYSFS="address"
-# only needed for kernels < 2.6.17
-SUBSYSTEM=="net", ENV{DRIVER}=="?*",           WAIT_FOR_SYSFS="device/driver"
-
-# devices needed to load the drivers providing them
-KERNEL=="tun",                                 OPTIONS+="ignore_remove"
-KERNEL=="ppp",                                 OPTIONS+="ignore_remove"
-KERNEL=="loop[0-9]*",                          OPTIONS+="ignore_remove"
-
-# default permissions for block devices
-SUBSYSTEM=="block",                            GROUP="disk"
-# the aacraid driver is broken and reports that disks removable (see #404927)
-SUBSYSTEM=="block", ATTRS{removable}=="1", \
-       DRIVERS!="aacraid",                     GROUP="floppy"
-# all block devices on these buses are "removable"
-SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy"
-
-# IDE devices
-KERNEL=="hd[a-z]|pcd[0-9]*",                   DRIVERS=="ide-cdrom|pcd", \
-       IMPORT{program}="cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*",                           GROUP="cdrom"
-KERNEL=="ht[0-9]*",                            GROUP="tape"
-KERNEL=="nht[0-9]*",                           GROUP="tape"
-
-# SCSI devices
-KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
-SUBSYSTEMS=="scsi", ATTRS{type}=="1",                          GROUP="tape"
-SUBSYSTEMS=="scsi", ATTRS{type}=="4",                          GROUP="cdrom"
-SUBSYSTEMS=="scsi", ATTRS{type}=="5",                          GROUP="cdrom"
-SUBSYSTEMS=="scsi", ATTRS{type}=="8",                          GROUP="tape"
-
-# USB devices
-KERNEL=="legousbtower*",       MODE="0666"
-KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb",         GROUP="lp"
-
-# usbfs-like devices
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \
-                               MODE="0664"
-
-# iRiver music players
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",  GROUP="plugdev", \
-       ATTRS{idVendor}=="4102", ATTRS{idProduct}=="10[01][135789]"
-
-# serial devices
-SUBSYSTEM=="tty",                              GROUP="dialout"
-SUBSYSTEM=="capi",                             GROUP="dialout"
-SUBSYSTEM=="slamr",                            GROUP="dialout"
-SUBSYSTEM=="zaptel",                           GROUP="dialout"
-
-# vc devices (all members of the tty subsystem)
-KERNEL=="ptmx",                        MODE="0666",    GROUP="root"
-KERNEL=="console",             MODE="0600",    GROUP="root"
-KERNEL=="tty",                 MODE="0666",    GROUP="root"
-KERNEL=="tty[0-9]*",                           GROUP="root"
-KERNEL=="pty*",                        MODE="0666",    GROUP="tty"
-
-# video devices
-SUBSYSTEM=="video4linux",                      GROUP="video"
-SUBSYSTEM=="drm",                              GROUP="video"
-SUBSYSTEM=="dvb",                              GROUP="video"
-SUBSYSTEM=="em8300",                           GROUP="video"
-SUBSYSTEM=="graphics",                         GROUP="video"
-SUBSYSTEM=="nvidia",                           GROUP="video"
-
-# misc devices
-KERNEL=="random",              MODE="0666"
-KERNEL=="urandom",             MODE="0666"
-KERNEL=="mem",                 MODE="0640",    GROUP="kmem"
-KERNEL=="kmem",                        MODE="0640",    GROUP="kmem"
-KERNEL=="port",                        MODE="0640",    GROUP="kmem"
-KERNEL=="full",                        MODE="0666"
-KERNEL=="null",                        MODE="0666"
-KERNEL=="zero",                        MODE="0666"
-KERNEL=="inotify",             MODE="0666"
-KERNEL=="sgi_fetchop",         MODE="0666"
-KERNEL=="sonypi",              MODE="0666"
-KERNEL=="agpgart",                             GROUP="video"
-KERNEL=="rtc|rtc[0-9]*",                       GROUP="audio"
-KERNEL=="kqemu",               MODE="0666"
-KERNEL=="tun",                 MODE="0666",
-
-KERNEL=="cdemu[0-9]*",                         GROUP="cdrom"
-KERNEL=="pktcdvd[0-9]*",                       GROUP="cdrom"
-KERNEL=="pktcdvd",             MODE="0644"
-
-# printers and parallel devices
-SUBSYSTEM=="printer",                          GROUP="lp"
-SUBSYSTEM=="ppdev",                            GROUP="lp"
-KERNEL=="irlpt*",                              GROUP="lp"
-KERNEL=="pt[0-9]*",                            GROUP="tape"
-KERNEL=="pht[0-9]*",                           GROUP="tape"
-
-# sound devices
-SUBSYSTEM=="sound",                            GROUP="audio"
-
-# ieee1394 devices       
-KERNEL=="raw1394",                             GROUP="disk"
-KERNEL=="dv1394*",                             GROUP="video"
-KERNEL=="video1394*",                          GROUP="video"
-
-# input devices
-KERNEL=="event[0-9]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \
-                               MODE="0664",    GROUP="video"
-KERNEL=="js[0-9]*",            MODE="0664"
-KERNEL=="lirc[0-9]*",                          GROUP="video"
-
-# AOE character devices
-SUBSYSTEM=="aoe",              MODE="0220",    GROUP="disk"
-SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
-
-LABEL="permissions_end"
-
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/run.rules b/meta-openvuplus/recipes-core/udev/udev-124/run.rules
deleted file mode 100644 (file)
index 75d7137..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
-
-# run a command on remove events
-ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
-
-# ignore the events generated by virtual consoles
-KERNEL=="ptmx",                OPTIONS+="last_rule"
-KERNEL=="console",     OPTIONS+="last_rule"
-KERNEL=="tty"  ,       OPTIONS+="last_rule"
-KERNEL=="tty[0-9]*",   OPTIONS+="last_rule"
-KERNEL=="pty*",                OPTIONS+="last_rule"
-SUBSYSTEM=="vc",       OPTIONS+="last_rule"
-
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/series b/meta-openvuplus/recipes-core/udev/udev-124/series
deleted file mode 100644 (file)
index a77b0dc..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-noasmlinkage.patch -p1
-flags.patch -p1
-vol_id_ld.patch -p1
-udevtrigger_add_devname_filtering.patch -p1
-libvolume-id-soname.patch -p1
-mtd-exclude-persistent.patch -p1
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/udev.rules b/meta-openvuplus/recipes-core/udev/udev-124/udev.rules
deleted file mode 100644 (file)
index 67326ee..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# workaround for devices which do not report media changes
-SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \
-       ENV{ID_MODEL}=="IOMEGA_ZIP*",   NAME="%k", OPTIONS+="all_partitions"
-SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \
-       OPTIONS+="all_partitions"
-
-# SCSI devices
-SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*",        NAME="scd%n", SYMLINK+="sr%n"
-
-# USB devices
-SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*",       NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*",       NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="dabusb*",          NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="hiddev*",          NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="legousbtower*",    NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*",         NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \
-       ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \
-                                       SYMLINK+="pilot"
-
-# usbfs-like devices
-SUBSYSTEM=="usb_device",       PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \
-                               NAME="%c"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",  NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}"
-
-# serial devices
-KERNEL=="capi",                        NAME="capi20", SYMLINK+="isdn/capi20"
-KERNEL=="capi[0-9]*",          NAME="capi/%n"
-
-# video devices
-KERNEL=="dvb*",                        PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \
-                               NAME="%c"
-KERNEL=="card[0-9]*",          NAME="dri/%k"
-
-# misc devices
-KERNEL=="hw_random",           NAME="hwrng"
-KERNEL=="tun",                 NAME="net/%k"
-KERNEL=="evtchn",              NAME="xen/%k"
-
-KERNEL=="cdemu[0-9]*",         NAME="cdemu/%n"
-KERNEL=="pktcdvd[0-9]*",       NAME="pktcdvd/%n"
-KERNEL=="pktcdvd",             NAME="pktcdvd/control"
-
-KERNEL=="cpu[0-9]*",           NAME="cpu/%n/cpuid"
-KERNEL=="msr[0-9]*",           NAME="cpu/%n/msr"
-KERNEL=="microcode",           NAME="cpu/microcode"
-
-KERNEL=="umad*",               NAME="infiniband/%k"
-KERNEL=="issm*",               NAME="infiniband/%k"
-KERNEL=="uverbs*",             NAME="infiniband/%k"
-KERNEL=="ucm*",                        NAME="infiniband/%k"
-KERNEL=="rdma_ucm",            NAME="infiniband/%k"
-
-# ALSA devices
-KERNEL=="controlC[0-9]*",      NAME="snd/%k"
-KERNEL=="hwC[D0-9]*",          NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*",       NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",                NAME="snd/%k"
-KERNEL=="timer",               NAME="snd/%k"
-KERNEL=="seq",                 NAME="snd/%k"
-
-# ieee1394 devices       
-KERNEL=="dv1394*",             NAME="dv1394/%n"
-KERNEL=="video1394*",          NAME="video1394/%n"
-
-# input devices
-KERNEL=="mice",                        NAME="input/%k"
-KERNEL=="mouse[0-9]*",         NAME="input/%k"
-KERNEL=="event[0-9]*",         NAME="input/%k"
-KERNEL=="js[0-9]*",            NAME="input/%k"
-KERNEL=="ts[0-9]*",            NAME="input/%k"
-KERNEL=="uinput",              NAME="input/%k"
-
-# Zaptel
-KERNEL=="zapctl",              NAME="zap/ctl"
-KERNEL=="zaptimer",            NAME="zap/timer"
-KERNEL=="zapchannel",          NAME="zap/channel"
-KERNEL=="zappseudo",           NAME="zap/pseudo"
-KERNEL=="zap[0-9]*",           NAME="zap/%n"
-
-# AOE character devices
-SUBSYSTEM=="aoe", KERNEL=="discover",  NAME="etherd/%k"
-SUBSYSTEM=="aoe", KERNEL=="err",       NAME="etherd/%k"
-SUBSYSTEM=="aoe", KERNEL=="interfaces",        NAME="etherd/%k"
-SUBSYSTEM=="aoe", KERNEL=="revalidate",        NAME="etherd/%k"
-
-# device mapper creates its own device nodes, so ignore these
-KERNEL=="dm-[0-9]*",           OPTIONS+="ignore_device"
-KERNEL=="device-mapper",       NAME="mapper/control"
-
-KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
-
-# Firmware Helper
-#ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh"
-
-# Samsung UARTS
-KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
-
-# MXC UARTs
-KERNEL=="ttymxc[0-4]",   NAME="ttymxc%n"
-
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch b/meta-openvuplus/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch
deleted file mode 100644 (file)
index 5182542..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -pru udev-124.orig/udevtrigger.c udev-124/udevtrigger.c
---- udev-124.orig/udevtrigger.c        2008-06-12 06:24:30.000000000 +0100
-+++ udev-124/udevtrigger.c     2008-07-07 15:10:09.000000000 +0100
-@@ -42,6 +42,8 @@ static int dry_run;
- LIST_HEAD(device_list);
- LIST_HEAD(filter_subsystem_match_list);
- LIST_HEAD(filter_subsystem_nomatch_list);
-+LIST_HEAD(filter_kernel_match_list);
-+LIST_HEAD(filter_kernel_nomatch_list);
- LIST_HEAD(filter_attr_match_list);
- LIST_HEAD(filter_attr_nomatch_list);
- static int sock = -1;
-@@ -331,6 +333,26 @@ static int attr_match(const char *path, 
-       return 0;
- }
-+static int kernel_filtered(const char *kernel)
-+{
-+      struct name_entry *loop_name;
-+
-+      /* skip devices matching the prohibited kernel device names */
-+      list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
-+              if (fnmatch(loop_name->name, kernel, 0) == 0)
-+                      return 1;
-+
-+      /* skip devices not matching the listed kernel device names */
-+      if (!list_empty(&filter_kernel_match_list)) {
-+              list_for_each_entry(loop_name, &filter_kernel_match_list, node)
-+                      if (fnmatch(loop_name->name, kernel, 0) == 0)
-+                              return 0;
-+              return 1;
-+      }
-+
-+      return 0;
-+}
-+
- static int attr_filtered(const char *path)
- {
-       struct name_entry *loop_name;
-@@ -409,6 +431,9 @@ static void scan_subsystem(const char *s
-                                       if (dent2->d_name[0] == '.')
-                                               continue;
-+                                      if (kernel_filtered(dent2->d_name))
-+                                              continue;
-+
-                                       strlcpy(dirname2, dirname, sizeof(dirname2));
-                                       strlcat(dirname2, "/", sizeof(dirname2));
-                                       strlcat(dirname2, dent2->d_name, sizeof(dirname2));
-@@ -465,6 +490,9 @@ static void scan_block(void)
-                                       if (!strcmp(dent2->d_name,"device"))
-                                               continue;
-+                                      if (kernel_filtered(dent2->d_name))
-+                                              continue;
-+
-                                       strlcpy(dirname2, dirname, sizeof(dirname2));
-                                       strlcat(dirname2, "/", sizeof(dirname2));
-                                       strlcat(dirname2, dent2->d_name, sizeof(dirname2));
-@@ -576,6 +604,8 @@ int udevtrigger(int argc, char *argv[], 
-               { "subsystem-nomatch", 1, NULL, 'S' },
-               { "attr-match", 1, NULL, 'a' },
-               { "attr-nomatch", 1, NULL, 'A' },
-+              { "kernel-match", 1, NULL, 'k' },
-+              { "kernel-nomatch", 1, NULL, 'K' },
-               { "env", 1, NULL, 'e' },
-               {}
-       };
-@@ -622,6 +652,12 @@ int udevtrigger(int argc, char *argv[], 
-               case 'A':
-                       name_list_add(&filter_attr_nomatch_list, optarg, 0);
-                       break;
-+              case 'k':
-+                      name_list_add(&filter_kernel_match_list, optarg, 0);
-+                      break;
-+              case 'K':
-+                      name_list_add(&filter_kernel_nomatch_list, optarg, 0);
-+                      break;
-               case 'h':
-                       printf("Usage: udevadm trigger OPTIONS\n"
-                              "  --verbose                       print the list of devices while running\n"
-@@ -632,6 +668,8 @@ int udevtrigger(int argc, char *argv[], 
-                              "  --env=<KEY>=<value>             pass an additional key (works only with --socket=)\n"
-                              "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
-                              "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
-+                             "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
-+                             "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
-                              "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
-                              "                                  attribute\n"
-                              "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
-@@ -701,6 +739,8 @@ int udevtrigger(int argc, char *argv[], 
- exit:
-       name_list_cleanup(&filter_subsystem_match_list);
-       name_list_cleanup(&filter_subsystem_nomatch_list);
-+      name_list_cleanup(&filter_kernel_match_list);
-+      name_list_cleanup(&filter_kernel_nomatch_list);
-       name_list_cleanup(&filter_attr_match_list);
-       name_list_cleanup(&filter_attr_nomatch_list);
diff --git a/meta-openvuplus/recipes-core/udev/udev-124/vol_id_ld.patch b/meta-openvuplus/recipes-core/udev/udev-124/vol_id_ld.patch
deleted file mode 100644 (file)
index 11126ee..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
----
- extras/volume_id/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: udev-115/extras/volume_id/Makefile
-===================================================================
---- udev-115.orig/extras/volume_id/Makefile    2007-09-20 18:17:59.000000000 +0200
-+++ udev-115/extras/volume_id/Makefile 2007-09-20 18:18:08.000000000 +0200
-@@ -44,7 +44,7 @@
- ifeq ($(strip $(VOLUME_ID_STATIC)),true)
-       $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
- else
--      $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
-+      $(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
- endif
- # man pages
diff --git a/meta-openvuplus/recipes-core/udev/udev-182/99_vuplus.rules b/meta-openvuplus/recipes-core/udev/udev-182/99_vuplus.rules
new file mode 100644 (file)
index 0000000..d9cedf8
--- /dev/null
@@ -0,0 +1,14 @@
+KERNEL=="fp0",                  SYMLINK+="dbox/fp0"
+KERNEL=="oled0",                SYMLINK+="dbox/oled0"
+KERNEL=="oled0",                SYMLINK+="dbox/lcd0"
+KERNEL=="hsm0",                 SYMLINK+="misc/hsm0"
+KERNEL=="pvr",                  SYMLINK+="misc/pvr"
+KERNEL=="vtuner0",              SYMLINK+="misc/vtuner0"
+KERNEL=="vtuner1",              SYMLINK+="misc/vtuner1"
+KERNEL=="vtuner2",              SYMLINK+="misc/vtuner2"
+KERNEL=="vtuner3",              SYMLINK+="misc/vtuner3"
+KERNEL=="fb[0-9]*",             SYMLINK+="fb/%n"
+KERNEL=="i2c-[0-9]*",           SYMLINK+="i2c/%n"
+KERNEL=="mtdblock[0-9]*",       SYMLINK+="mtdblock/%n"
+KERNEL=="tty[0-9]*",            SYMLINK+="vc/%n"
+
diff --git a/meta-openvuplus/recipes-core/udev/udev-182/init b/meta-openvuplus/recipes-core/udev/udev-182/init
new file mode 100644 (file)
index 0000000..41f9628
--- /dev/null
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev (symlinks only) and load drivers.
+### END INIT INFO
+
+export TZ=/etc/localtime
+
+[ -d /sys/class ] || exit 1
+[ -r /proc/mounts ] || exit 1
+[ -x /lib/udev/udevd ] || exit 1
+[ -f /etc/default/udev ] && . /etc/default/udev
+[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+
+kill_udevd() {
+        pid=`pidof -x udevd`
+        [ -n "$pid" ] && kill $pid
+}
+
+export ACTION=add
+
+echo "Starting udev"
+
+# make_extra_nodes
+kill_udevd > "/dev/null" 2>&1
+
+# trigger the sorted events
+echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+/lib/udev/udevd -d
+
+/usr/bin/udevadm control --env STARTUP=1
+/usr/bin/udevadm trigger --action=add
+
+touch /dev/.udev
+
+exit 0
diff --git a/meta-openvuplus/recipes-core/udev/udev_124.bb b/meta-openvuplus/recipes-core/udev/udev_124.bb
deleted file mode 100644 (file)
index 59b0608..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
-/dev/, handles hotplug events and loads drivers at boot time. It replaces \
-the hotplug package and requires a kernel not older than 2.6.12."
-RPROVIDES_${PN} = "hotplug"
-PR = "r33"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
-          file://noasmlinkage.patch \
-          file://flags.patch \
-          file://vol_id_ld.patch \
-          file://udevtrigger_add_devname_filtering.patch \
-          file://libvolume-id-soname.patch \
-          file://mtd-exclude-persistent.patch \
-          file://mount.blacklist \
-          file://run.rules \
-          file://default \
-          file://local.rules \
-          "
-
-SRC_URI_append_vuplus = " \
-       file://40-od-devfs-compatibility.rules \
-       file://42-od-oled-compatibility.rules \
-       file://41-od-linux-2.6.18-misc.rules \
-"
-
-require udev_124.inc
-
-INITSCRIPT_PARAMS = "start 04 S ."
-
-FILES_${PN} += "${base_libdir}/udev/*"
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
-UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
-EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
-
-do_install () {
-       install -d ${D}${usrsbindir} \
-                  ${D}${sbindir}
-       oe_runmake 'DESTDIR=${D}' INSTALL=install install
-       install -d ${D}${sysconfdir}/init.d
-       install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
-
-       install -d ${D}${sysconfdir}/default
-       install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
-
-       install -d ${D}${sysconfdir}/udev/rules.d/
-
-       install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
-       install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
-       install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
-       install -m 0644 ${WORKDIR}/run.rules          ${D}${sysconfdir}/udev/rules.d/run.rules
-       install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
-       install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
-       if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
-               install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
-       fi
-
-       touch ${D}${sysconfdir}/udev/saved.uname
-       touch ${D}${sysconfdir}/udev/saved.cmdline
-       touch ${D}${sysconfdir}/udev/saved.atags
-
-       install -d ${D}${sysconfdir}/udev/scripts/
-
-       install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-       install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-
-       install -d ${D}${base_libdir}/udev/
-}
-
-do_install_append() {
-       install -m 0644 ${WORKDIR}/??-od-*.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-SRC_URI[md5sum] = "2ea9229208154229c5d6df6222f74ad7"
-SRC_URI[sha256sum] = "cc9f58ff58fbd3f5868e1f1e368e3c93e1f441afd0ac1dcbd5d01a9ce5b5b0d7"
diff --git a/meta-openvuplus/recipes-core/udev/udev_124.inc b/meta-openvuplus/recipes-core/udev/udev_124.inc
deleted file mode 100644 (file)
index 30c0d75..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
-/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-SRC_URI += " \
-          file://udev.rules \
-          file://devfs-udev.rules \
-          file://links.conf \
-           file://permissions.rules \
-          file://mount.sh \
-          file://network.sh \
-          file://local.rules \
-           file://init"
-
-inherit update-rc.d autotools-brokensep pkgconfig
-
-PARALLEL_MAKE = ""
-UDEV_DEVFS_RULES ?= "0"
-PKG_libvolume-id-dev = "libvolume-id-dev"
-
-INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 04 S ."
-
-export CROSS = "${TARGET_PREFIX}"
-export HOSTCC = "${BUILD_CC}"
-export udevdir ?= "/dev"
-export usrbindir := "${bindir}"
-export usrsbindir := "${sbindir}"
-export etcdir = "${sysconfdir}"
-LD = "${CC}"
-bindir = "/bin"
-sbindir = "/sbin"
-
-UDEV_EXTRAS = "<override me>"
-EXTRA_OEMAKE = "-e \
-               'EXTRAS=${UDEV_EXTRAS}' \
-               'STRIP=echo'"
-
-do_install () {
-       install -d ${D}${usrsbindir} \
-                  ${D}${sbindir}
-       oe_runmake 'DESTDIR=${D}' INSTALL=install install
-       install -d ${D}${sysconfdir}/init.d
-       install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
-
-       install -d ${D}${sysconfdir}/udev/rules.d/
-
-       install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
-       install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
-       install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
-       if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
-               install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
-       fi
-
-       install -d ${D}${sysconfdir}/udev/scripts/
-
-       install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-       install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-}
-
-PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_udev-utils = "${usrbindir}/udevinfo ${sbindir}/udevadm ${usrbindir}/udevtest"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
diff --git a/meta-openvuplus/recipes-core/udev/udev_182.bbappend b/meta-openvuplus/recipes-core/udev/udev_182.bbappend
new file mode 100644 (file)
index 0000000..b3d74cc
--- /dev/null
@@ -0,0 +1,20 @@
+PR .= "-vuplus0"
+
+SRC_URI += " \
+       file://init \
+       file://99_vuplus.rules \
+"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "udev"
+INITSCRIPT_PARAMS = "start 03 S ."
+
+do_install_append () {
+       rm ${D}${sysconfdir}/udev/rules.d/*.rules || /bin/true
+       install -d ${D}${sysconfdir}/init.d
+       install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+       install -m 0755 ${WORKDIR}/99_vuplus.rules ${D}${sysconfdir}/udev/rules.d
+}
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"