diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-07 12:09:51 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-07 12:10:26 +0100 |
| commit | 1c24729697a75a7bac325e26b9c1102aa6b08a3d (patch) | |
| tree | f3b2c95e11e167ed3e32c0ab668d005cbd529265 /meta/recipes-core | |
| parent | 85cf6f3e97e8ec4cc34c8994c59f993b18556fb6 (diff) | |
| download | openembedded-core-1c24729697a75a7bac325e26b9c1102aa6b08a3d.tar.gz openembedded-core-1c24729697a75a7bac325e26b9c1102aa6b08a3d.tar.bz2 openembedded-core-1c24729697a75a7bac325e26b9c1102aa6b08a3d.zip | |
udev: Drop old versions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core')
35 files changed, 0 insertions, 2302 deletions
diff --git a/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch b/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch deleted file mode 100644 index 4bd0d4d9b9..0000000000 --- a/meta/recipes-core/udev/udev-092/arm_inotify_fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: udev-092/udev_libc_wrapper.h -=================================================================== ---- udev-092.orig/udev_libc_wrapper.h 2006-07-26 21:55:06.000000000 +0100 -+++ udev-092/udev_libc_wrapper.h 2006-07-26 21:55:37.000000000 +0100 -@@ -58,9 +58,9 @@ - # define __NR_inotify_add_watch 152 - # define __NR_inotify_rm_watch 156 - #elif defined (__arm__) --# define __NR_inotify_init 316 --# define __NR_inotify_add_watch 317 --# define __NR_inotify_rm_watch 318 -+# define __NR_inotify_init __NR_SYSCALL_BASE+316 -+# define __NR_inotify_add_watch __NR_SYSCALL_BASE+317 -+# define __NR_inotify_rm_watch __NR_SYSCALL_BASE+318 - #elif defined (__sh__) - # define __NR_inotify_init 290 - # define __NR_inotify_add_watch 291 diff --git a/meta/recipes-core/udev/udev-092/flags.patch b/meta/recipes-core/udev/udev-092/flags.patch deleted file mode 100644 index 492a39881c..0000000000 --- a/meta/recipes-core/udev/udev-092/flags.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- udev-089/Makefile.orig 2006-04-08 13:32:53.000000000 +0200 -+++ udev-089/Makefile 2006-04-08 13:34:27.000000000 +0200 -@@ -117,28 +117,28 @@ - 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 - - 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 - -@@ -151,11 +151,11 @@ - 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/recipes-core/udev/udev-092/init b/meta/recipes-core/udev/udev-092/init deleted file mode 100644 index 5a60d52a9a..0000000000 --- a/meta/recipes-core/udev/udev-092/init +++ /dev/null @@ -1,227 +0,0 @@ -#!/bin/sh -e -### BEGIN INIT INFO -# Provides: udev -# Required-Start: mountvirtfs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# Short-Description: Start udevd, populate /dev and load drivers. -### END INIT INFO - -# we need to unmount /dev/pts/ and remount it later over the tmpfs -unmount_devpts() { - if mountpoint -q /dev/pts/; then - umount -l /dev/pts/ - fi - - if mountpoint -q /dev/shm/; then - umount -l /dev/shm/ - fi -} - -# mount a tmpfs over /dev, if somebody did not already do it -mount_tmpfs() { - if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then - return - fi - - # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. - # /etc/udev/ is recycled as a temporary mount point because it's the only - # directory which is guaranteed to be available. - mount -n -o bind /dev /etc/udev - - if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then - umount /etc/udev - echo "udev requires tmpfs support, not started." - exit 1 - fi - - mkdir -p /dev/.static/dev - chmod 700 /dev/.static/ - # The mount options in busybox are non-standard... - if test -x /bin/mount.util-linux - then - /bin/mount.util-linux --move /etc/udev /dev/.static/dev - elif test -x /bin/busybox - then - busybox mount -n -o move /etc/udev /dev/.static/dev - else - echo "udev requires an identifiable mount command, not started." - umount /etc/udev - umount /dev - exit 1 - fi -} - -# I hate this hack. -- Md -make_extra_nodes() { - if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then - cp -a /lib/udev/devices/* /dev/ - fi - - [ -e /etc/udev/links.conf ] || return 0 - grep '^[^#]' /etc/udev/links.conf | \ - while read type name arg1; do - [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue - case "$type" in - L) ln -s $arg1 /dev/$name ;; - D) mkdir -p /dev/$name ;; - M) mknod -m 600 /dev/$name $arg1 ;; - *) echo "links.conf: unparseable line ($type $name $arg1)" ;; - esac - done -} - -supported_kernel() { - case "$(uname -r)" in - 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; - 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;; - esac - return 0 -} - -set_hotplug_handler() { - case "$(uname -r)" in - 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;; - esac - echo $HANDLER > /proc/sys/kernel/hotplug -} - -# shell version of /usr/bin/tty -my_tty() { - [ -x /bin/readlink ] || return 0 - [ -e /proc/self/fd/0 ] || return 0 - readlink --silent /proc/self/fd/0 || true -} - -warn_if_interactive() { - if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then - return - fi - - TTY=$(my_tty) - if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then - return - fi - - printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" - printf "has been run from an interactive shell.\n" - printf "It will probably not do what you expect, so this script will wait\n" - printf "60 seconds before continuing. Press ^C to stop it.\n" - printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" - sleep 60 -} - -############################################################################## - -PATH="/sbin:/bin:/usr/bin" - -[ -x /sbin/udevd ] || exit 0 - -# defaults -tmpfs_size="10M" -udev_root="/dev" -udevd_timeout=30 - -. /etc/udev/udev.conf - -if ! supported_kernel; then - echo "udev requires a kernel >= 2.6.12, not started." - exit 1 -fi - -if [ ! -e /proc/filesystems ]; then - echo "udev requires a mounted procfs, not started." - exit 1 -fi - -if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then - echo "udev requires tmpfs support, not started." - exit 1 -fi - -if [ ! -d /sys/class/ ]; then - echo "udev requires a mounted sysfs, not started." - exit 1 -fi - -if [ ! -e /proc/sys/kernel/hotplug ]; then - echo "udev requires hotplug support, not started." - exit 1 -fi - -############################################################################## - -# When modifying this script, do not forget that between the time that -# the new /dev has been mounted and udevsynthesize 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 /dev/; then - TMPFS_MOUNTED=1 - else - echo ".udev/ already exists on the static $udev_root!" - fi - else - warn_if_interactive - fi - - echo "Starting the hotplug events dispatcher" "udevd" - udevd --daemon - - set_hotplug_handler - - if [ -z "$TMPFS_MOUNTED" ]; then - unmount_devpts - mount_tmpfs - [ -d /proc/1 ] || mount -n /proc - fi - - # if this directory is not present /dev will not be updated by udev - mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/ - # /dev/null must be created before udevd is started - make_extra_nodes - - echo "Synthesizing the initial hotplug events" - udevsynthesize - - # wait for the udevd childs to finish - echo "Waiting for /dev to be fully populated" - while [ -d /dev/.udev/queue/ ]; do - sleep 1 - udevd_timeout=$(($udevd_timeout - 1)) - if [ $udevd_timeout -eq 0 ]; then - # ps axf - break - fi - done - if [ $udevd_timeout -eq 0 ]; then - echo 'timeout' - fi - ;; - - stop) - echo "Stopping the hotplug events dispatcher" "udevd" - start-stop-daemon --stop --name udevd --quiet - ;; - - restart|force-reload) - echo "Stopping the hotplug events dispatcher" "udevd" - if start-stop-daemon --stop --name udevd --quiet ; then - exit 1 - fi - - echo "Starting the hotplug events dispatcher" "udevd" - udevd --daemon - ;; - - *) - echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 - diff --git a/meta/recipes-core/udev/udev-092/local.rules b/meta/recipes-core/udev/udev-092/local.rules deleted file mode 100644 index 5b926018f5..0000000000 --- a/meta/recipes-core/udev/udev-092/local.rules +++ /dev/null @@ -1,31 +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" diff --git a/meta/recipes-core/udev/udev-092/permissions.rules b/meta/recipes-core/udev/udev-092/permissions.rules deleted file mode 100644 index 8da35c3090..0000000000 --- a/meta/recipes-core/udev/udev-092/permissions.rules +++ /dev/null @@ -1,109 +0,0 @@ -ACTION!="add", GOTO="permissions_end" - -# workarounds needed to synchronize with sysfs -DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" -SUBSYSTEM=="scsi", 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{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" - -# default permissions for block devices -SUBSYSTEM=="block", GROUP="disk" -SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" - -# IDE devices -BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ - IMPORT{program}="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", GROUP="cdrom" -BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" -BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" - -# SCSI devices -BUS=="scsi", SYSFS{type}=="1", GROUP="tape" -BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner" -BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" -BUS=="scsi", SYSFS{type}=="6", GROUP="scanner" - -# USB devices -BUS=="usb", KERNEL=="legousbtower*", MODE="0666" -BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" - -# usbfs-like devices -SUBSYSTEM=="usb_device", MODE="0664" - -# iRiver music players -SUBSYSTEM=="usb_device", GROUP="plugdev", \ - SYSFS{idVendor}=="4102", SYSFS{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=="nvram", GROUP="nvram" -KERNEL=="rtc", GROUP="audio" -KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" -KERNEL=="fuse", GROUP="fuse" - -KERNEL=="cdemu[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd", MODE="0644" - -KERNEL=="uverbs*", GROUP="rdma" -KERNEL=="ucm*", GROUP="rdma" - -# printers and parallel devices -SUBSYSTEM=="printer", GROUP="lp" -SUBSYSTEM=="ppdev", 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]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ - MODE="0664", GROUP="video" -KERNEL=="js[0-9]*", MODE="0664" - -# AOE character devices -SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" -SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" - -LABEL="permissions_end" - diff --git a/meta/recipes-core/udev/udev-092/udev.rules b/meta/recipes-core/udev/udev-092/udev.rules deleted file mode 100644 index 72be706e84..0000000000 --- a/meta/recipes-core/udev/udev-092/udev.rules +++ /dev/null @@ -1,102 +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 -# - -# SCSI devices -BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" - -# USB devices -BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" -BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" -BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" -BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" -BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" -BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" -BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ - SYMLINK+="pilot" - -# usbfs-like devices -SUBSYSTEM=="usb_device", \ - PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" - -# serial devices -KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" -KERNEL=="capi[0-9]*", NAME="capi/%n" - -# video devices -KERNEL=="card[0-9]*", NAME="dri/%k" - -# misc devices -KERNEL=="hw_random", NAME="hwrng" -KERNEL=="tun", NAME="net/%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=="buzzer", NAME="misc/buzzer" - -# 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" - -# 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_helper" - -# Samsung UARTS -KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" - diff --git a/meta/recipes-core/udev/udev-115/flags.patch b/meta/recipes-core/udev/udev-115/flags.patch deleted file mode 100644 index 13f20eb6a8..0000000000 --- a/meta/recipes-core/udev/udev-115/flags.patch +++ /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/recipes-core/udev/udev-115/init b/meta/recipes-core/udev/udev-115/init deleted file mode 100644 index c882c75607..0000000000 --- a/meta/recipes-core/udev/udev-115/init +++ /dev/null @@ -1,48 +0,0 @@ -export TZ=/etc/localtime - -[ -d /sys/class ] || exit 1 -[ -r /proc/mounts ] || exit 1 -[ -x /sbin/udevd ] || exit 1 -[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -kill_udevd() { - if [ -x /sbin/pidof ]; then - pid=`/sbin/pidof -x udevd` - [ -n "$pid" ] && kill $pid - fi -} - -export ACTION=add -# propagate /dev from /sys -echo -n "Starting udev" - -# mount the tmpfs on /dev, if not already done -LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { - mount -n -o mode=0755 -t tmpfs none "/dev" - mkdir -m 0755 /dev/pts - mkdir -m 0755 /dev/shm -} - -if [ -e /etc/dev.tar ]; then - (cd /; tar xf /etc/dev.tar) - not_first_boot=1 -fi - -# make_extra_nodes -kill_udevd > "/dev/null" 2>&1 - - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - /sbin/udevd -d - - /sbin/udevcontrol env STARTUP=1 - if [ "$not_first_boot" != "" ];then - /sbin/udevtrigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform - (/sbin/udevsettle --timeout=3; /sbin/udevcontrol env STARTUP=)& - else - /sbin/udevtrigger - /sbin/udevsettle - fi - -echo -exit 0 diff --git a/meta/recipes-core/udev/udev-115/local.rules b/meta/recipes-core/udev/udev-115/local.rules deleted file mode 100644 index 5b926018f5..0000000000 --- a/meta/recipes-core/udev/udev-115/local.rules +++ /dev/null @@ -1,31 +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" diff --git a/meta/recipes-core/udev/udev-115/noasmlinkage.patch b/meta/recipes-core/udev/udev-115/noasmlinkage.patch deleted file mode 100644 index 5824d29590..0000000000 --- a/meta/recipes-core/udev/udev-115/noasmlinkage.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - udevd.c | 2 +- - udevstart.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: udev-115/udevd.c -=================================================================== ---- udev-115.orig/udevd.c 2007-08-24 01:29:54.000000000 +0200 -+++ udev-115/udevd.c 2007-09-20 17:04:51.000000000 +0200 -@@ -767,7 +767,7 @@ - return msg; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGINT: -Index: udev-115/udevstart.c -=================================================================== ---- udev-115.orig/udevstart.c 2007-08-24 01:29:54.000000000 +0200 -+++ udev-115/udevstart.c 2007-09-20 17:04:51.000000000 +0200 -@@ -304,7 +304,7 @@ - } - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: diff --git a/meta/recipes-core/udev/udev-115/permissions.rules b/meta/recipes-core/udev/udev-115/permissions.rules deleted file mode 100644 index 99e03b1036..0000000000 --- a/meta/recipes-core/udev/udev-115/permissions.rules +++ /dev/null @@ -1,101 +0,0 @@ -ACTION!="add", GOTO="permissions_end" - -# workarounds needed to synchronize with sysfs -DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" -SUBSYSTEM=="scsi", 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{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" - -# default permissions for block devices -SUBSYSTEM=="block", GROUP="disk" -SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" - -# IDE devices -BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ - IMPORT{program}="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", GROUP="cdrom" -BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" -BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" - -# SCSI devices -BUS=="scsi", SYSFS{type}=="1", GROUP="tape" -BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" - -# USB devices -BUS=="usb", KERNEL=="legousbtower*", MODE="0666" -BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" - -# usbfs-like devices -SUBSYSTEM=="usb_device", MODE="0664" - -# iRiver music players -SUBSYSTEM=="usb_device", GROUP="plugdev", \ - SYSFS{idVendor}=="4102", SYSFS{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", GROUP="audio" - -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=="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]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ - MODE="0664", GROUP="video" -KERNEL=="js[0-9]*", MODE="0664" - -# AOE character devices -SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" -SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" - -LABEL="permissions_end" - diff --git a/meta/recipes-core/udev/udev-115/udev.rules b/meta/recipes-core/udev/udev-115/udev.rules deleted file mode 100644 index 4d29acac0c..0000000000 --- a/meta/recipes-core/udev/udev-115/udev.rules +++ /dev/null @@ -1,105 +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 -# - -# SCSI devices -BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" - -# USB devices -BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" -BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" -BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" -BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" -BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" -BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" -BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ - SYMLINK+="pilot" - -# usbfs-like devices -SUBSYSTEM=="usb_device", \ - PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" - -# serial devices -KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" -KERNEL=="capi[0-9]*", NAME="capi/%n" - -# video devices -KERNEL=="card[0-9]*", NAME="dri/%k" - -# misc devices -KERNEL=="hw_random", NAME="hwrng" -KERNEL=="tun", NAME="net/%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=="buzzer", NAME="misc/buzzer" - -# 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" - -# 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_helper" - -# Samsung UARTS -KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n" - -# MXC UARTs -KERNEL=="ttymxc[0-4]", NAME="ttymxc%n" - diff --git a/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch deleted file mode 100644 index 87cafcaa9d..0000000000 --- a/meta/recipes-core/udev/udev-115/udevtrigger_add_devname_filtering.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- - udevtrigger.c | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 40 insertions(+) - -Index: udev-115/udevtrigger.c -=================================================================== ---- udev-115.orig/udevtrigger.c 2007-08-24 01:29:54.000000000 +0200 -+++ udev-115/udevtrigger.c 2007-09-21 18:45:28.000000000 +0200 -@@ -39,6 +39,8 @@ - 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); - -@@ -218,6 +220,26 @@ - 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; -@@ -296,6 +318,9 @@ - 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)); -@@ -402,6 +427,9 @@ - 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)); -@@ -458,6 +486,8 @@ - { "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' }, - {} - }; - -@@ -496,6 +526,12 @@ - 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: udevtrigger OPTIONS\n" - " --verbose print the list of devices while running\n" -@@ -504,6 +540,8 @@ - " marked as failed during a previous run\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" -@@ -549,6 +587,8 @@ - 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/recipes-core/udev/udev-115/vol_id_ld.patch b/meta/recipes-core/udev/udev-115/vol_id_ld.patch deleted file mode 100644 index 11126eef8d..0000000000 --- a/meta/recipes-core/udev/udev-115/vol_id_ld.patch +++ /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/recipes-core/udev/udev-124/flags.patch b/meta/recipes-core/udev/udev-124/flags.patch deleted file mode 100644 index 13f20eb6a8..0000000000 --- a/meta/recipes-core/udev/udev-124/flags.patch +++ /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/recipes-core/udev/udev-124/init b/meta/recipes-core/udev/udev-124/init deleted file mode 100644 index 32ab370aa9..0000000000 --- a/meta/recipes-core/udev/udev-124/init +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -e - -### BEGIN INIT INFO -# Provides: udev -# Required-Start: mountvirtfs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# Short-Description: Start udevd, populate /dev and load drivers. -### END INIT INFO - -export TZ=/etc/localtime - -[ -d /sys/class ] || exit 1 -[ -r /proc/mounts ] || exit 1 -[ -x /sbin/udevd ] || exit 1 -[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -kill_udevd() { - if [ -x /sbin/pidof ]; then - pid=`/sbin/pidof -x udevd` - [ -n "$pid" ] && kill $pid - fi -} - -export ACTION=add -# propagate /dev from /sys -echo -n "Starting udev" - -# mount the tmpfs on /dev, if not already done -LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { - mount -n -o mode=0755 -t tmpfs none "/dev" - mkdir -m 0755 /dev/pts - mkdir -m 0755 /dev/shm -} - -if [ -e /etc/dev.tar ]; then - (cd /; tar xf /etc/dev.tar) - not_first_boot=1 -fi - -# make_extra_nodes -kill_udevd > "/dev/null" 2>&1 - - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - /sbin/udevd -d - - /sbin/udevadm control env STARTUP=1 - if [ "$not_first_boot" != "" ];then - /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform - (/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)& - else - /sbin/udevadm trigger - /sbin/udevadm settle - fi - -echo -exit 0 diff --git a/meta/recipes-core/udev/udev-124/local.rules b/meta/recipes-core/udev/udev-124/local.rules deleted file mode 100644 index 5b926018f5..0000000000 --- a/meta/recipes-core/udev/udev-124/local.rules +++ /dev/null @@ -1,31 +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" diff --git a/meta/recipes-core/udev/udev-124/noasmlinkage.patch b/meta/recipes-core/udev/udev-124/noasmlinkage.patch deleted file mode 100644 index d58a7ea4de..0000000000 --- a/meta/recipes-core/udev/udev-124/noasmlinkage.patch +++ /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/recipes-core/udev/udev-124/permissions.rules b/meta/recipes-core/udev/udev-124/permissions.rules deleted file mode 100644 index 205b733292..0000000000 --- a/meta/recipes-core/udev/udev-124/permissions.rules +++ /dev/null @@ -1,131 +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}=="3", ATTRS{vendor}=="HP", GROUP="scanner" -SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson", GROUP="scanner" -SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", GROUP="scanner" -SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" -SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" -SUBSYSTEMS=="scsi", ATTRS{type}=="6", GROUP="scanner" -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=="nvram", GROUP="nvram" -KERNEL=="rtc|rtc[0-9]*", GROUP="audio" -KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" -KERNEL=="fuse", GROUP="fuse" -KERNEL=="kqemu", MODE="0666" -KERNEL=="kvm", GROUP="kvm" -KERNEL=="tun", MODE="0666", - -KERNEL=="cdemu[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd", MODE="0644" - -KERNEL=="uverbs*", GROUP="rdma" -KERNEL=="ucm*", GROUP="rdma" -KERNEL=="rdma_ucm", GROUP="rdma" - -# 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/recipes-core/udev/udev-124/run.rules b/meta/recipes-core/udev/udev-124/run.rules deleted file mode 100644 index 75d71375bb..0000000000 --- a/meta/recipes-core/udev/udev-124/run.rules +++ /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/recipes-core/udev/udev-124/udev.rules b/meta/recipes-core/udev/udev-124/udev.rules deleted file mode 100644 index a19d4a0bf6..0000000000 --- a/meta/recipes-core/udev/udev-124/udev.rules +++ /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/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch b/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch deleted file mode 100644 index 5182542461..0000000000 --- a/meta/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch +++ /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/recipes-core/udev/udev-124/vol_id_ld.patch b/meta/recipes-core/udev/udev-124/vol_id_ld.patch deleted file mode 100644 index 11126eef8d..0000000000 --- a/meta/recipes-core/udev/udev-124/vol_id_ld.patch +++ /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/recipes-core/udev/udev-141/igep0020/local.rules b/meta/recipes-core/udev/udev-141/igep0020/local.rules deleted file mode 100644 index db976d0419..0000000000 --- a/meta/recipes-core/udev/udev-141/igep0020/local.rules +++ /dev/null @@ -1,34 +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" - -# The first framebuffer is symlinked to /dev/fb -KERNEL=="fb0", SYMLINK+="fb" - -# 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" diff --git a/meta/recipes-core/udev/udev-141/init b/meta/recipes-core/udev/udev-141/init deleted file mode 100644 index eb5e50758b..0000000000 --- a/meta/recipes-core/udev/udev-141/init +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -e - -### BEGIN INIT INFO -# Provides: udev -# Required-Start: mountvirtfs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# Short-Description: Start udevd, populate /dev and load drivers. -### END INIT INFO - -export TZ=/etc/localtime - -[ -d /sys/class ] || exit 1 -[ -r /proc/mounts ] || exit 1 -[ -x /sbin/udevd ] || exit 1 -[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -kill_udevd() { - if [ -x /sbin/pidof ]; then - pid=`/sbin/pidof -x udevd` - [ -n "$pid" ] && kill $pid - fi -} - -export ACTION=add -# propagate /dev from /sys -echo -n "Starting udev" - -# mount the tmpfs on /dev, if not already done -LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { - mount -n -o mode=0755 -t tmpfs none "/dev" - mkdir -m 0755 /dev/pts - mkdir -m 1777 /dev/shm -} - -if [ -e /etc/dev.tar ]; then - (cd /; tar xf /etc/dev.tar) - not_first_boot=1 -fi - -# make_extra_nodes -kill_udevd > "/dev/null" 2>&1 - - # trigger the sorted events - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - /sbin/udevd -d - - /sbin/udevadm control --env=STARTUP=1 - if [ "$not_first_boot" != "" ];then - /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform - (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)& - else - /sbin/udevadm trigger - /sbin/udevadm settle - fi - -echo -exit 0 diff --git a/meta/recipes-core/udev/udev-141/local.rules b/meta/recipes-core/udev/udev-141/local.rules deleted file mode 100644 index dab319b431..0000000000 --- a/meta/recipes-core/udev/udev-141/local.rules +++ /dev/null @@ -1,33 +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 -# Need to use ../ so the eventX can find the parent inputX modalias which is a directory above -SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{../modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" - diff --git a/meta/recipes-core/udev/udev-141/noasmlinkage.patch b/meta/recipes-core/udev/udev-141/noasmlinkage.patch deleted file mode 100644 index 6f9fe948f2..0000000000 --- a/meta/recipes-core/udev/udev-141/noasmlinkage.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: udev-141/udev/test-udev.c -=================================================================== ---- udev-141.orig/udev/test-udev.c 2008-10-24 09:07:24.000000000 +0100 -+++ udev-141/udev/test-udev.c 2009-04-14 15:34:01.000000000 +0100 -@@ -30,7 +30,7 @@ - - #include "udev.h" - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGALRM: -Index: udev-141/udev/udevadm-monitor.c -=================================================================== ---- udev-141.orig/udev/udevadm-monitor.c 2009-03-29 19:07:01.000000000 +0100 -+++ udev-141/udev/udevadm-monitor.c 2009-04-14 15:34:01.000000000 +0100 -@@ -35,7 +35,7 @@ - - static int udev_exit; - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - if (signum == SIGINT || signum == SIGTERM) - udev_exit = 1; -Index: udev-141/udev/udevd.c -=================================================================== ---- udev-141.orig/udev/udevd.c 2009-03-29 19:07:01.000000000 +0100 -+++ udev-141/udev/udevd.c 2009-04-14 15:34:56.000000000 +0100 -@@ -172,7 +172,7 @@ - udev_event_unref(event); - } - --static void asmlinkage event_sig_handler(int signum) -+static void event_sig_handler(int signum) - { - if (signum == SIGALRM) - exit(1); -@@ -583,7 +583,7 @@ - return 0; - } - --static void asmlinkage sig_handler(int signum) -+static void sig_handler(int signum) - { - switch (signum) { - case SIGINT: diff --git a/meta/recipes-core/udev/udev-141/permissions.rules b/meta/recipes-core/udev/udev-141/permissions.rules deleted file mode 100644 index 205b733292..0000000000 --- a/meta/recipes-core/udev/udev-141/permissions.rules +++ /dev/null @@ -1,131 +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}=="3", ATTRS{vendor}=="HP", GROUP="scanner" -SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson", GROUP="scanner" -SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", GROUP="scanner" -SUBSYSTEMS=="scsi", ATTRS{type}=="4", GROUP="cdrom" -SUBSYSTEMS=="scsi", ATTRS{type}=="5", GROUP="cdrom" -SUBSYSTEMS=="scsi", ATTRS{type}=="6", GROUP="scanner" -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=="nvram", GROUP="nvram" -KERNEL=="rtc|rtc[0-9]*", GROUP="audio" -KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" -KERNEL=="fuse", GROUP="fuse" -KERNEL=="kqemu", MODE="0666" -KERNEL=="kvm", GROUP="kvm" -KERNEL=="tun", MODE="0666", - -KERNEL=="cdemu[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" -KERNEL=="pktcdvd", MODE="0644" - -KERNEL=="uverbs*", GROUP="rdma" -KERNEL=="ucm*", GROUP="rdma" -KERNEL=="rdma_ucm", GROUP="rdma" - -# 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/recipes-core/udev/udev-141/run.rules b/meta/recipes-core/udev/udev-141/run.rules deleted file mode 100644 index 75d71375bb..0000000000 --- a/meta/recipes-core/udev/udev-141/run.rules +++ /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/recipes-core/udev/udev-141/udev.rules b/meta/recipes-core/udev/udev-141/udev.rules deleted file mode 100644 index a19d4a0bf6..0000000000 --- a/meta/recipes-core/udev/udev-141/udev.rules +++ /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/recipes-core/udev/udev-141/unbreak.patch b/meta/recipes-core/udev/udev-141/unbreak.patch deleted file mode 100644 index bb5988dca4..0000000000 --- a/meta/recipes-core/udev/udev-141/unbreak.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: udev-141/extras/volume_id/lib/Makefile.am -=================================================================== ---- udev-141.orig/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:16.000000000 +0100 -+++ udev-141/extras/volume_id/lib/Makefile.am 2009-05-17 23:36:26.000000000 +0100 -@@ -54,19 +54,6 @@ - -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \ - -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols - --# move devel files to $(prefix)$(libdir_name) if needed --install-data-hook: -- rm $(DESTDIR)$(rootlibdir)/libvolume_id.la -- if test "$(prefix)" != "$(exec_prefix)"; then \ -- mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \ -- mv $(DESTDIR)$(rootlibdir)/libvolume_id.a $(DESTDIR)$(prefix)/$(libdir_name)/; \ -- so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libvolume_id.so); \ -- rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \ -- so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ -- ln -sf $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \ -- $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \ -- fi -- - EXTRA_DIST = \ - exported_symbols - diff --git a/meta/recipes-core/udev/udev_092.bb b/meta/recipes-core/udev/udev_092.bb deleted file mode 100644 index 0e94d1f6c8..0000000000 --- a/meta/recipes-core/udev/udev_092.bb +++ /dev/null @@ -1,58 +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 = "r17" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://udevsynthesize.patch;patch=1 \ - file://udevsynthesize.sh \ - file://arm_inotify_fix.patch;patch=1 \ - " - -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - -require udev.inc - -INITSCRIPT_PARAMS = "start 03 S ." - -FILES_${PN} += "${base_libdir}/udev/*" -FILES_${PN}-dbg += "${base_libdir}/udev/.debug" -UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" -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 -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache - - 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 - 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 - - 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/ - install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize - install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize -} - -do_install_append_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} diff --git a/meta/recipes-core/udev/udev_115.bb b/meta/recipes-core/udev/udev_115.bb deleted file mode 100644 index 9db8661b61..0000000000 --- a/meta/recipes-core/udev/udev_115.bb +++ /dev/null @@ -1,55 +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 = "r5" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://vol_id_ld.patch;patch=1 \ - file://udevtrigger_add_devname_filtering.patch;patch=1 \ - " - -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - -require udev.inc - -INITSCRIPT_PARAMS = "start 03 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 -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache - - 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 - 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 - - 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_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} diff --git a/meta/recipes-core/udev/udev_124.bb b/meta/recipes-core/udev/udev_124.bb deleted file mode 100644 index ccfbbf7018..0000000000 --- a/meta/recipes-core/udev/udev_124.bb +++ /dev/null @@ -1,62 +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 = "r10" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://noasmlinkage.patch;patch=1 \ - file://flags.patch;patch=1 \ - file://vol_id_ld.patch;patch=1 \ - file://udevtrigger_add_devname_filtering.patch;patch=1 \ - file://run.rules \ - " - -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - -require udev.inc - -INITSCRIPT_PARAMS = "start 03 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 -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache - - 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}/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 - - # Remove some default rules that don't work well on embedded devices - rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules - rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules - rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules - - 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_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} diff --git a/meta/recipes-core/udev/udev_141.bb b/meta/recipes-core/udev/udev_141.bb deleted file mode 100644 index 3893a98a2d..0000000000 --- a/meta/recipes-core/udev/udev_141.bb +++ /dev/null @@ -1,65 +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 = "r8" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://noasmlinkage.patch;patch=1 \ - file://unbreak.patch;patch=1 \ - file://run.rules \ - " - -SRC_URI_append_h2200 = " file://50-hostap_cs.rules " -PACKAGE_ARCH_h2200 = "h2200" - -require udev.inc - -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=" - -exec_prefix = "" - -EXTRA_OECONF = "--with-udev-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 -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache - - install -d ${D}${sysconfdir}/udev/rules.d/ - - cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ - cp ${S}/rules/packages/* ${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}/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 - - # Remove some default rules that don't work well on embedded devices - #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-input.rules - #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage.rules - #rm ${D}${sysconfdir}/udev/rules.d/60-persistent-storage-tape.rules - - 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_h2200() { - install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules -} - |