Recipe for udev-124
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4837 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Joshua Lock
parent
4c78c04481
commit
47780f8c43
|
|
@ -0,0 +1,56 @@
|
|||
---
|
||||
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
|
||||
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
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/udevsettle --timeout=3; /sbin/udevcontrol env STARTUP=)&
|
||||
else
|
||||
/sbin/udevadm trigger
|
||||
/sbin/udevsettle
|
||||
(cd /; tar cf /etc/dev.tar /dev)
|
||||
fi
|
||||
|
||||
echo
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
# 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"
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
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;
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
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"
|
||||
|
||||
|
|
@ -0,0 +1,105 @@
|
|||
# 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"
|
||||
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
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);
|
||||
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
---
|
||||
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
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
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"
|
||||
|
||||
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://mount.blacklist \
|
||||
"
|
||||
|
||||
SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
|
||||
PACKAGE_ARCH_h2200 = "h2200"
|
||||
|
||||
require udev.inc
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
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 -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}/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
|
||||
}
|
||||
Loading…
Reference in New Issue