2003-10-17 15:40:02 +07:00
|
|
|
# Makefile for udev
|
2005-04-27 10:59:47 +07:00
|
|
|
#
|
2004-10-06 09:01:12 +07:00
|
|
|
# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
|
2005-03-06 16:15:51 +07:00
|
|
|
# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
|
2005-04-27 10:59:47 +07:00
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; version 2 of the License.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
# General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software
|
|
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
#
|
|
|
|
|
2005-03-27 06:11:03 +07:00
|
|
|
# Set this to make use of syslog.
|
2004-01-16 13:00:58 +07:00
|
|
|
USE_LOG = true
|
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 12:53:20 +07:00
|
|
|
|
2005-03-27 06:11:03 +07:00
|
|
|
# Set this to compile-in development debug messages. Pass UDEV_LOG="debug"
|
|
|
|
# to the executed binary or set the value in the udev configuration file to
|
|
|
|
# let udev print the debug messages to syslog.
|
2003-12-03 09:41:29 +07:00
|
|
|
DEBUG = false
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2005-03-06 16:15:51 +07:00
|
|
|
# Set this to include Security-Enhanced Linux support.
|
2004-10-06 13:39:05 +07:00
|
|
|
USE_SELINUX = false
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2005-03-27 06:11:03 +07:00
|
|
|
# Set this to comile with klibc instead of glibc.
|
2005-03-06 16:15:51 +07:00
|
|
|
USE_KLIBC = false
|
|
|
|
|
|
|
|
# Set this to create statically linked binaries.
|
|
|
|
USE_STATIC = false
|
|
|
|
|
|
|
|
# To build any of the extras programs, run with:
|
|
|
|
# make EXTRAS="extras/a extras/b"
|
|
|
|
EXTRAS=
|
|
|
|
|
|
|
|
# make the build silent. Set this to something else to make it noisy again.
|
|
|
|
V=false
|
|
|
|
|
2005-04-27 10:59:47 +07:00
|
|
|
ROOT = udev
|
[PATCH] spilt udev into pieces
On Thu, Jan 22, 2004 at 01:27:45AM +0100, Kay Sievers wrote:
> On Wed, Jan 21, 2004 at 02:38:25PM +0100, Kay Sievers wrote:
> > On Thu, Jan 15, 2004 at 01:45:10PM -0800, Greg KH wrote:
> > > On Thu, Jan 15, 2004 at 10:36:25PM +0800, Ling, Xiaofeng wrote:
> > > > Hi, Greg
> > > > I wrote a simple implementation for the two pieces
> > > > of send and receive hotplug event,
> > > > use a message queue and a list for the out of order
> > > > hotplug event. It also has a timeout timer of 3 seconds.
> > > > They are now separate program. the file nseq is the test script.
> > > > Could you have a look to see wether it is feasible?
> > > > If so, I'll continue to merge with udev.
> > >
> > > Yes, very nice start. Please continue on.
> > >
> > > One minor comment, please stick with the kernel coding style when you
> > > are writing new code for udev.
> >
> > I took the code from Xiaofeng, cleaned the whitespace, renamed some bits,
> > tweaked the debugging, added the udev exec and created a patch for the current tree.
> >
> > It seems functional now, by simply executing our current udev (dirty hack).
> > It reorders the incoming events and if one is missing it delays the
> > execution of the following ones up to a maximum of 10 seconds.
> >
> > Test script is included, but you can't mix hotplug sequence numbers and
> > test script numbers, it will result in waiting for the missing numbers :)
>
> Hey, nobody want's to play with me?
> So here I'm chatting with myself :)
>
> This is the next version with signal handling for resetting the expected
> signal number. I changed the behaviour of the timeout to skip all
> missing events at once and to proceed with the next event in the queue.
>
> So it's now possible to use the test script at any time, cause it resets
> the daemon, if real hotplug event coming in later all missing nimbers will
> be skipped after a timeout of 10 seconds and the queued events are applied.
Here is the next updated updated version to apply to the lastet udev.
I've added infrastructure for getting the state of the IPC queue in the
sender and set the program to exec by the daemon. Also the magic key id
is replaced by the usual key generation by path/nr.
It looks promising, I use it on my machine and my 4in1 USB-flash-reader
connect/disconnect emits the events "randomly" but udevd is able to
reorder it and calls our normal udev in the right order.
2004-01-23 15:28:57 +07:00
|
|
|
DAEMON = udevd
|
|
|
|
SENDER = udevsend
|
2005-06-05 09:41:09 +07:00
|
|
|
CONTROL = udevcontrol
|
2004-03-03 14:49:08 +07:00
|
|
|
INFO = udevinfo
|
2004-02-13 11:19:21 +07:00
|
|
|
TESTER = udevtest
|
2004-03-02 16:30:38 +07:00
|
|
|
STARTER = udevstart
|
2005-05-21 03:18:28 +07:00
|
|
|
VERSION = 058
|
2005-04-27 10:59:47 +07:00
|
|
|
INSTALL_DIR = /usr/local/bin
|
2003-04-11 01:25:55 +07:00
|
|
|
RELEASE_NAME = $(ROOT)-$(VERSION)
|
2004-01-01 11:35:02 +07:00
|
|
|
LOCAL_CFG_DIR = etc/udev
|
2003-10-30 13:26:35 +07:00
|
|
|
DESTDIR =
|
2004-02-03 15:51:51 +07:00
|
|
|
KERNEL_DIR = /lib/modules/${shell uname -r}/build
|
|
|
|
|
2003-10-16 13:50:13 +07:00
|
|
|
# override this to make udev look in a different location for it's config files
|
2003-10-17 11:18:40 +07:00
|
|
|
prefix =
|
|
|
|
exec_prefix = ${prefix}
|
|
|
|
etcdir = ${prefix}/etc
|
|
|
|
sbindir = ${exec_prefix}/sbin
|
2004-03-03 14:49:08 +07:00
|
|
|
usrbindir = ${exec_prefix}/usr/bin
|
2003-10-17 11:18:40 +07:00
|
|
|
mandir = ${prefix}/usr/share/man
|
|
|
|
hotplugdir = ${etcdir}/hotplug.d/default
|
2004-04-24 11:50:27 +07:00
|
|
|
configdir = ${etcdir}/udev
|
|
|
|
initdir = ${etcdir}/init.d
|
|
|
|
dev_ddir = ${etcdir}/dev.d
|
2003-10-17 11:18:40 +07:00
|
|
|
srcdir = .
|
|
|
|
|
|
|
|
INSTALL = /usr/bin/install -c
|
|
|
|
INSTALL_PROGRAM = ${INSTALL}
|
|
|
|
INSTALL_DATA = ${INSTALL} -m 644
|
|
|
|
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
|
|
|
|
2003-10-16 13:50:13 +07:00
|
|
|
# place to put our device nodes
|
2004-11-06 20:28:01 +07:00
|
|
|
udevdir = ${prefix}/udev
|
|
|
|
udevdb = ${udevdir}/.udevdb
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2004-02-28 15:30:24 +07:00
|
|
|
# set up PWD so that older versions of make will work with our build.
|
|
|
|
PWD = $(shell pwd)
|
|
|
|
|
2005-04-27 10:59:47 +07:00
|
|
|
# If you are running a cross compiler, you may want to set this
|
2004-01-10 16:19:57 +07:00
|
|
|
# to something more interesting, like "arm-linux-". If you want
|
2005-04-27 10:59:47 +07:00
|
|
|
# to compile vs uClibc, that can be done here as well.
|
|
|
|
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
|
|
|
|
CC = $(CROSS)gcc
|
2003-11-25 13:10:23 +07:00
|
|
|
LD = $(CROSS)gcc
|
2005-04-27 10:59:47 +07:00
|
|
|
AR = $(CROSS)ar
|
|
|
|
STRIP = $(CROSS)strip
|
2003-08-05 15:10:01 +07:00
|
|
|
RANLIB = $(CROSS)ranlib
|
2004-10-14 12:28:06 +07:00
|
|
|
HOSTCC = gcc
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS
|
2005-04-27 10:59:47 +07:00
|
|
|
|
|
|
|
# code taken from uClibc to determine the current arch
|
|
|
|
ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
|
2003-12-02 15:44:48 +07:00
|
|
|
-e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
|
2005-04-27 10:59:47 +07:00
|
|
|
|
|
|
|
# code taken from uClibc to determine the gcc include dir
|
2004-04-17 09:34:01 +07:00
|
|
|
GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
|
2005-04-27 10:59:47 +07:00
|
|
|
|
|
|
|
# code taken from uClibc to determine the libgcc.a filename
|
|
|
|
GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
|
|
|
|
|
|
|
|
# use '-Os' optimization if available, else use -O2
|
|
|
|
OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
|
|
|
|
then echo "-Os"; else echo "-O2" ; fi}
|
|
|
|
|
2005-02-05 08:44:37 +07:00
|
|
|
# check if compiler option is supported
|
|
|
|
cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
|
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
|
|
|
|
CFLAGS += $(call cc-supports,-Wno-pointer-sign)
|
|
|
|
CFLAGS += $(call cc-supports,-Wdeclaration-after-statement)
|
|
|
|
CFLAGS += -pipe
|
|
|
|
CFLAGS += -D_GNU_SOURCE
|
2004-10-07 13:40:35 +07:00
|
|
|
|
2005-02-05 08:43:16 +07:00
|
|
|
HEADERS = \
|
2005-03-06 12:16:52 +07:00
|
|
|
udev.h \
|
|
|
|
udev_utils.h \
|
2005-03-13 04:36:32 +07:00
|
|
|
udev_rules.h \
|
2005-03-06 12:16:52 +07:00
|
|
|
udev_version.h \
|
|
|
|
udev_db.h \
|
|
|
|
udev_sysfs.h \
|
|
|
|
logging.h \
|
|
|
|
udev_libc_wrapper.h \
|
|
|
|
udev_selinux.h \
|
2005-02-05 08:43:16 +07:00
|
|
|
list.h
|
|
|
|
|
|
|
|
SYSFS_OBJS = \
|
|
|
|
libsysfs/sysfs_class.o \
|
|
|
|
libsysfs/sysfs_device.o \
|
|
|
|
libsysfs/sysfs_dir.o \
|
|
|
|
libsysfs/sysfs_driver.o \
|
|
|
|
libsysfs/sysfs_utils.o \
|
|
|
|
libsysfs/dlist.o
|
|
|
|
|
|
|
|
UDEV_OBJS = \
|
|
|
|
udev_utils.o \
|
|
|
|
udev_config.o \
|
|
|
|
udev_add.o \
|
|
|
|
udev_remove.o \
|
|
|
|
udev_sysfs.o \
|
|
|
|
udev_db.o \
|
|
|
|
udev_multiplex.o \
|
2005-03-13 04:36:32 +07:00
|
|
|
udev_rules.o \
|
|
|
|
udev_rules_parse.o \
|
2005-03-06 12:16:52 +07:00
|
|
|
udev_libc_wrapper.o
|
2005-02-05 08:43:16 +07:00
|
|
|
|
|
|
|
OBJS = \
|
|
|
|
udev.a \
|
|
|
|
libsysfs/sysfs.a
|
|
|
|
|
|
|
|
SYSFS = $(PWD)/libsysfs/sysfs.a
|
|
|
|
|
|
|
|
CFLAGS += -I$(PWD)/libsysfs/sysfs \
|
|
|
|
-I$(PWD)/libsysfs
|
|
|
|
|
2004-01-16 13:00:58 +07:00
|
|
|
ifeq ($(strip $(USE_LOG)),true)
|
2005-03-06 16:15:51 +07:00
|
|
|
CFLAGS += -DUSE_LOG
|
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 12:53:20 +07:00
|
|
|
endif
|
|
|
|
|
2005-04-27 10:59:47 +07:00
|
|
|
# if DEBUG is enabled, then we do not strip or optimize
|
|
|
|
ifeq ($(strip $(DEBUG)),true)
|
2005-03-17 17:02:53 +07:00
|
|
|
CFLAGS += -O1 -g -DDEBUG
|
|
|
|
LDFLAGS += -Wl
|
2005-04-27 10:59:47 +07:00
|
|
|
STRIPCMD = /bin/true -Since_we_are_debugging
|
|
|
|
else
|
2005-03-17 17:02:53 +07:00
|
|
|
CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
|
|
|
|
LDFLAGS += -s -Wl
|
2005-04-27 10:59:47 +07:00
|
|
|
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
|
|
|
|
endif
|
|
|
|
|
2004-01-01 10:11:04 +07:00
|
|
|
# If we are using our version of klibc, then we need to build, link it, and then
|
2005-02-05 08:43:16 +07:00
|
|
|
# link udev against it statically. Otherwise, use glibc and link dynamically.
|
2003-12-17 14:41:59 +07:00
|
|
|
ifeq ($(strip $(USE_KLIBC)),true)
|
2005-03-17 17:02:53 +07:00
|
|
|
KLIBC_INSTALL = $(PWD)/klibc/.install
|
|
|
|
KLCC = $(KLIBC_INSTALL)/bin/klcc
|
|
|
|
CC = $(KLCC)
|
|
|
|
LD = $(KLCC)
|
|
|
|
LDFLAGS += -static
|
2005-04-27 10:59:47 +07:00
|
|
|
else
|
2005-03-17 17:02:53 +07:00
|
|
|
CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
|
2005-04-27 10:59:47 +07:00
|
|
|
endif
|
|
|
|
|
2004-10-06 13:39:05 +07:00
|
|
|
ifeq ($(strip $(USE_SELINUX)),true)
|
2005-02-05 08:43:16 +07:00
|
|
|
UDEV_OBJS += udev_selinux.o
|
2004-10-06 13:39:05 +07:00
|
|
|
LIB_OBJS += -lselinux
|
2005-02-05 08:43:16 +07:00
|
|
|
CFLAGS += -DUSE_SELINUX
|
2004-10-06 13:39:05 +07:00
|
|
|
endif
|
|
|
|
|
2005-03-06 16:15:51 +07:00
|
|
|
ifeq ($(strip $(USE_STATIC)),true)
|
|
|
|
CFLAGS += -DUSE_STATIC
|
|
|
|
LDFLAGS += -static
|
|
|
|
endif
|
|
|
|
|
2005-02-05 08:43:16 +07:00
|
|
|
ifeq ($(strip $(V)),false)
|
|
|
|
QUIET=@$(PWD)/ccdv
|
|
|
|
HOST_PROGS=ccdv
|
|
|
|
else
|
|
|
|
QUIET=
|
|
|
|
HOST_PROGS=
|
|
|
|
endif
|
2003-12-08 00:04:49 +07:00
|
|
|
|
2004-10-06 12:15:16 +07:00
|
|
|
# config files automatically generated
|
|
|
|
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
|
|
|
|
|
2005-06-05 09:41:09 +07:00
|
|
|
all: $(ROOT) $(SENDER) $(CONTROL) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
|
2003-12-18 09:32:53 +07:00
|
|
|
@extras="$(EXTRAS)" ; for target in $$extras ; do \
|
2003-12-08 00:04:49 +07:00
|
|
|
echo $$target ; \
|
2004-02-03 15:51:51 +07:00
|
|
|
$(MAKE) prefix=$(prefix) \
|
|
|
|
LD="$(LD)" \
|
2004-10-16 08:42:53 +07:00
|
|
|
SYSFS="$(SYSFS)" \
|
2004-02-03 15:51:51 +07:00
|
|
|
KERNEL_DIR="$(KERNEL_DIR)" \
|
2004-12-09 10:30:41 +07:00
|
|
|
QUIET="$(QUIET)" \
|
2003-12-08 00:04:49 +07:00
|
|
|
-C $$target $@ ; \
|
|
|
|
done ; \
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
$(KLCC):
|
2005-04-02 23:06:26 +07:00
|
|
|
$(MAKE) -j1 -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
|
2005-03-17 17:02:53 +07:00
|
|
|
SHLIBDIR=$(KLIBC_INSTALL)/lib \
|
|
|
|
INSTALLDIR=$(KLIBC_INSTALL) \
|
|
|
|
bindir=$(KLIBC_INSTALL)/bin \
|
|
|
|
mandir=$(KLIBC_INSTALL)/man all install
|
2005-03-19 08:15:43 +07:00
|
|
|
-find $(KLIBC_INSTALL)/include -name SCCS -print| xargs rm -rf
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2004-11-25 14:38:06 +07:00
|
|
|
udev.a: $(UDEV_OBJS)
|
2004-11-25 15:52:19 +07:00
|
|
|
rm -f $@
|
2004-11-25 14:38:06 +07:00
|
|
|
$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
|
|
|
|
$(QUIET) $(RANLIB) $@
|
|
|
|
|
|
|
|
libsysfs/sysfs.a: $(SYSFS_OBJS)
|
2004-11-25 15:52:19 +07:00
|
|
|
rm -f $@
|
2004-11-25 14:38:06 +07:00
|
|
|
$(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
|
|
|
|
$(QUIET) $(RANLIB) $@
|
|
|
|
|
2005-04-27 10:59:47 +07:00
|
|
|
# header files automatically generated
|
|
|
|
GEN_HEADERS = udev_version.h
|
|
|
|
|
2004-10-14 12:28:06 +07:00
|
|
|
ccdv:
|
|
|
|
@echo "Building ccdv"
|
|
|
|
@$(HOSTCC) -O1 ccdv.c -o ccdv
|
|
|
|
|
2005-04-27 10:59:47 +07:00
|
|
|
# Rules on how to create the generated header files
|
|
|
|
udev_version.h:
|
2004-10-14 12:33:09 +07:00
|
|
|
@echo "Creating udev_version.h"
|
2004-04-24 11:50:27 +07:00
|
|
|
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
|
2004-11-06 20:28:01 +07:00
|
|
|
@echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
|
|
|
|
@echo \#define UDEV_DB \"$(udevdb)\" >> $@
|
2004-04-24 11:50:27 +07:00
|
|
|
@echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@
|
|
|
|
@echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
|
|
|
|
@echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
|
|
|
|
@echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@
|
|
|
|
@echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2003-12-11 23:12:29 +07:00
|
|
|
# Rules on how to create the generated config files
|
2004-10-16 07:15:52 +07:00
|
|
|
$(LOCAL_CFG_DIR)/udev.conf:
|
|
|
|
sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
|
2003-12-11 23:12:29 +07:00
|
|
|
|
2004-04-02 15:13:50 +07:00
|
|
|
GEN_MANPAGES = udev.8
|
|
|
|
GEN_MANPAGESIN = udev.8.in
|
2004-04-02 14:47:23 +07:00
|
|
|
# Rules on how to create the man pages
|
2004-10-16 07:15:52 +07:00
|
|
|
$(GEN_MANPAGES): $(GEN_MANPAGESIN)
|
|
|
|
sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
|
2004-04-02 14:47:23 +07:00
|
|
|
|
2005-04-02 23:06:26 +07:00
|
|
|
$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
|
|
|
$(SYSFS_OBJS): $(HOST_PROGS) $(KLCC)
|
|
|
|
$(OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
|
|
|
$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
|
|
|
$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
|
|
|
$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
|
|
|
$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
|
|
|
$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
2005-06-05 09:41:09 +07:00
|
|
|
$(CONTROL).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
2005-04-02 23:06:26 +07:00
|
|
|
$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
|
|
|
|
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(ROOT).o $(OBJS) $(LIB_OBJS)
|
2004-10-14 12:28:06 +07:00
|
|
|
$(QUIET) $(STRIPCMD) $@
|
2004-01-27 09:55:37 +07:00
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
$(TESTER): $(KLCC) $(TESTER).o $(OBJS) $(HEADERS)
|
|
|
|
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(TESTER).o $(OBJS) $(LIB_OBJS)
|
2004-10-14 12:28:06 +07:00
|
|
|
$(QUIET) $(STRIPCMD) $@
|
2004-02-13 11:19:21 +07:00
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
$(INFO): $(KLCC) $(INFO).o $(OBJS) $(HEADERS)
|
|
|
|
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(INFO).o $(OBJS) $(LIB_OBJS)
|
2004-10-14 12:28:06 +07:00
|
|
|
$(QUIET) $(STRIPCMD) $@
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
$(DAEMON): $(KLCC) $(DAEMON).o $(OBJS) udevd.h
|
|
|
|
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(DAEMON).o $(OBJS) $(LIB_OBJS)
|
2004-10-14 12:28:06 +07:00
|
|
|
$(QUIET) $(STRIPCMD) $@
|
[PATCH] spilt udev into pieces
On Thu, Jan 22, 2004 at 01:27:45AM +0100, Kay Sievers wrote:
> On Wed, Jan 21, 2004 at 02:38:25PM +0100, Kay Sievers wrote:
> > On Thu, Jan 15, 2004 at 01:45:10PM -0800, Greg KH wrote:
> > > On Thu, Jan 15, 2004 at 10:36:25PM +0800, Ling, Xiaofeng wrote:
> > > > Hi, Greg
> > > > I wrote a simple implementation for the two pieces
> > > > of send and receive hotplug event,
> > > > use a message queue and a list for the out of order
> > > > hotplug event. It also has a timeout timer of 3 seconds.
> > > > They are now separate program. the file nseq is the test script.
> > > > Could you have a look to see wether it is feasible?
> > > > If so, I'll continue to merge with udev.
> > >
> > > Yes, very nice start. Please continue on.
> > >
> > > One minor comment, please stick with the kernel coding style when you
> > > are writing new code for udev.
> >
> > I took the code from Xiaofeng, cleaned the whitespace, renamed some bits,
> > tweaked the debugging, added the udev exec and created a patch for the current tree.
> >
> > It seems functional now, by simply executing our current udev (dirty hack).
> > It reorders the incoming events and if one is missing it delays the
> > execution of the following ones up to a maximum of 10 seconds.
> >
> > Test script is included, but you can't mix hotplug sequence numbers and
> > test script numbers, it will result in waiting for the missing numbers :)
>
> Hey, nobody want's to play with me?
> So here I'm chatting with myself :)
>
> This is the next version with signal handling for resetting the expected
> signal number. I changed the behaviour of the timeout to skip all
> missing events at once and to proceed with the next event in the queue.
>
> So it's now possible to use the test script at any time, cause it resets
> the daemon, if real hotplug event coming in later all missing nimbers will
> be skipped after a timeout of 10 seconds and the queued events are applied.
Here is the next updated updated version to apply to the lastet udev.
I've added infrastructure for getting the state of the IPC queue in the
sender and set the program to exec by the daemon. Also the magic key id
is replaced by the usual key generation by path/nr.
It looks promising, I use it on my machine and my 4in1 USB-flash-reader
connect/disconnect emits the events "randomly" but udevd is able to
reorder it and calls our normal udev in the right order.
2004-01-23 15:28:57 +07:00
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
$(SENDER): $(KLCC) $(SENDER).o $(OBJS) udevd.h
|
|
|
|
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(SENDER).o $(OBJS) $(LIB_OBJS)
|
2004-10-14 12:28:06 +07:00
|
|
|
$(QUIET) $(STRIPCMD) $@
|
[PATCH] spilt udev into pieces
On Thu, Jan 22, 2004 at 01:27:45AM +0100, Kay Sievers wrote:
> On Wed, Jan 21, 2004 at 02:38:25PM +0100, Kay Sievers wrote:
> > On Thu, Jan 15, 2004 at 01:45:10PM -0800, Greg KH wrote:
> > > On Thu, Jan 15, 2004 at 10:36:25PM +0800, Ling, Xiaofeng wrote:
> > > > Hi, Greg
> > > > I wrote a simple implementation for the two pieces
> > > > of send and receive hotplug event,
> > > > use a message queue and a list for the out of order
> > > > hotplug event. It also has a timeout timer of 3 seconds.
> > > > They are now separate program. the file nseq is the test script.
> > > > Could you have a look to see wether it is feasible?
> > > > If so, I'll continue to merge with udev.
> > >
> > > Yes, very nice start. Please continue on.
> > >
> > > One minor comment, please stick with the kernel coding style when you
> > > are writing new code for udev.
> >
> > I took the code from Xiaofeng, cleaned the whitespace, renamed some bits,
> > tweaked the debugging, added the udev exec and created a patch for the current tree.
> >
> > It seems functional now, by simply executing our current udev (dirty hack).
> > It reorders the incoming events and if one is missing it delays the
> > execution of the following ones up to a maximum of 10 seconds.
> >
> > Test script is included, but you can't mix hotplug sequence numbers and
> > test script numbers, it will result in waiting for the missing numbers :)
>
> Hey, nobody want's to play with me?
> So here I'm chatting with myself :)
>
> This is the next version with signal handling for resetting the expected
> signal number. I changed the behaviour of the timeout to skip all
> missing events at once and to proceed with the next event in the queue.
>
> So it's now possible to use the test script at any time, cause it resets
> the daemon, if real hotplug event coming in later all missing nimbers will
> be skipped after a timeout of 10 seconds and the queued events are applied.
Here is the next updated updated version to apply to the lastet udev.
I've added infrastructure for getting the state of the IPC queue in the
sender and set the program to exec by the daemon. Also the magic key id
is replaced by the usual key generation by path/nr.
It looks promising, I use it on my machine and my 4in1 USB-flash-reader
connect/disconnect emits the events "randomly" but udevd is able to
reorder it and calls our normal udev in the right order.
2004-01-23 15:28:57 +07:00
|
|
|
|
2005-06-05 09:41:09 +07:00
|
|
|
$(CONTROL): $(KLCC) $(CONTROL).o $(OBJS) udevd.h
|
|
|
|
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CONTROL).o $(OBJS) $(LIB_OBJS)
|
|
|
|
$(QUIET) $(STRIPCMD) $@
|
|
|
|
|
2005-03-17 17:02:53 +07:00
|
|
|
$(STARTER): $(KLCC) $(STARTER).o $(OBJS)
|
|
|
|
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(STARTER).o $(OBJS) $(LIB_OBJS)
|
2005-03-07 06:01:34 +07:00
|
|
|
$(QUIET) $(STRIPCMD) $@
|
|
|
|
|
2004-10-14 12:28:06 +07:00
|
|
|
.c.o:
|
|
|
|
$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
|
|
|
|
|
2005-04-27 10:59:47 +07:00
|
|
|
clean:
|
|
|
|
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
|
|
|
|
| xargs rm -f
|
2005-03-13 02:55:41 +07:00
|
|
|
-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
|
2005-06-05 09:41:09 +07:00
|
|
|
$(SENDER) $(CONTROL) $(TESTER) $(STARTER)
|
2004-10-14 12:33:09 +07:00
|
|
|
-rm -f ccdv
|
2004-12-15 17:26:05 +07:00
|
|
|
$(MAKE) -C klibc SUBDIRS=klibc clean
|
2003-12-18 09:32:53 +07:00
|
|
|
@extras="$(EXTRAS)" ; for target in $$extras ; do \
|
2003-12-08 00:04:49 +07:00
|
|
|
echo $$target ; \
|
|
|
|
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
|
|
|
|
-C $$target $@ ; \
|
|
|
|
done ; \
|
2005-04-27 10:59:47 +07:00
|
|
|
|
2004-03-13 14:52:21 +07:00
|
|
|
spotless: clean
|
2004-12-15 17:26:05 +07:00
|
|
|
$(MAKE) -C klibc SUBDIRS=klibc spotless
|
2005-03-17 17:02:53 +07:00
|
|
|
rm -rf klibc/.install
|
2004-03-13 14:52:21 +07:00
|
|
|
|
2004-11-13 14:43:34 +07:00
|
|
|
release: spotless
|
2005-05-21 03:22:05 +07:00
|
|
|
git-tar-tree HEAD $(RELEASE_NAME) | gzip -9v > $(RELEASE_NAME).tar.gz
|
2004-02-12 14:23:17 +07:00
|
|
|
@echo "$(RELEASE_NAME).tar.gz created"
|
2003-11-19 12:35:44 +07:00
|
|
|
|
2004-10-06 12:15:16 +07:00
|
|
|
install-config:
|
2004-04-24 11:50:27 +07:00
|
|
|
$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
|
|
|
|
@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
|
2004-01-01 11:35:02 +07:00
|
|
|
echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
|
|
|
|
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
|
2003-12-20 09:29:05 +07:00
|
|
|
fi
|
2004-04-24 11:50:27 +07:00
|
|
|
@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
|
|
|
|
echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
|
|
|
|
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
|
2003-12-20 09:29:05 +07:00
|
|
|
fi
|
|
|
|
|
2004-03-25 15:03:28 +07:00
|
|
|
install-dev.d:
|
2004-04-24 11:50:27 +07:00
|
|
|
$(INSTALL) -d $(DESTDIR)$(dev_ddir)/default
|
|
|
|
$(INSTALL_PROGRAM) -D etc/dev.d/net/hotplug.dev $(DESTDIR)$(dev_ddir)/net/hotplug.dev
|
2004-04-02 14:37:43 +07:00
|
|
|
|
|
|
|
uninstall-dev.d:
|
2004-04-24 11:50:27 +07:00
|
|
|
- rm $(dev_ddir)/net/hotplug.dev
|
|
|
|
- rmdir $(dev_ddir)/net
|
|
|
|
- rmdir $(dev_ddir)/default
|
2004-04-02 14:37:43 +07:00
|
|
|
- rmdir $(dev_ddir)
|
2004-03-25 15:03:28 +07:00
|
|
|
|
2004-04-02 15:01:58 +07:00
|
|
|
install-man:
|
2004-04-02 14:47:23 +07:00
|
|
|
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
|
|
|
|
$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
|
|
|
|
$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
|
|
|
|
$(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
|
|
|
|
$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
|
|
|
|
- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
|
|
|
|
|
|
|
|
uninstall-man:
|
|
|
|
- rm $(mandir)/man8/udev.8
|
|
|
|
- rm $(mandir)/man8/udevinfo.8
|
|
|
|
- rm $(mandir)/man8/udevtest.8
|
|
|
|
- rm $(mandir)/man8/udevstart.8
|
|
|
|
- rm $(mandir)/man8/udevd.8
|
|
|
|
- rm $(mandir)/man8/udevsend.8
|
|
|
|
|
2004-12-08 04:45:36 +07:00
|
|
|
install: install-config install-man install-dev.d all
|
2003-12-20 09:29:05 +07:00
|
|
|
$(INSTALL) -d $(DESTDIR)$(udevdir)
|
2003-10-30 13:26:35 +07:00
|
|
|
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
|
|
|
|
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
|
2004-02-02 23:00:07 +07:00
|
|
|
$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
|
|
|
|
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
|
2005-06-05 09:41:09 +07:00
|
|
|
$(INSTALL_PROGRAM) -D $(CONTROL) $(DESTDIR)$(sbindir)/$(CONTROL)
|
2004-03-03 14:49:08 +07:00
|
|
|
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
|
2004-03-23 13:18:34 +07:00
|
|
|
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
|
2005-03-07 06:01:34 +07:00
|
|
|
$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
|
2004-09-05 23:05:32 +07:00
|
|
|
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
|
2004-03-02 13:23:35 +07:00
|
|
|
ifndef DESTDIR
|
2004-11-06 20:28:01 +07:00
|
|
|
- killall $(DAEMON)
|
|
|
|
- rm -rf $(udevdb)
|
2004-03-02 13:23:35 +07:00
|
|
|
endif
|
2003-12-18 09:32:53 +07:00
|
|
|
@extras="$(EXTRAS)" ; for target in $$extras ; do \
|
2003-12-08 00:04:49 +07:00
|
|
|
echo $$target ; \
|
|
|
|
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
|
|
|
|
-C $$target $@ ; \
|
|
|
|
done ; \
|
2003-10-17 14:19:04 +07:00
|
|
|
|
2004-04-02 14:47:23 +07:00
|
|
|
uninstall: uninstall-man uninstall-dev.d
|
2004-09-05 23:05:32 +07:00
|
|
|
- rm $(hotplugdir)/10-udev.hotplug
|
2004-04-24 11:50:27 +07:00
|
|
|
- rm $(configdir)/rules.d/50-udev.rules
|
2003-12-03 16:08:46 +07:00
|
|
|
- rm $(configdir)/udev.conf
|
2004-04-24 11:50:27 +07:00
|
|
|
- rmdir $(configdir)/rules.d
|
|
|
|
- rmdir $(configdir)
|
2003-10-17 14:19:04 +07:00
|
|
|
- rm $(sbindir)/$(ROOT)
|
2004-02-02 23:00:07 +07:00
|
|
|
- rm $(sbindir)/$(DAEMON)
|
|
|
|
- rm $(sbindir)/$(SENDER)
|
2005-06-05 09:41:09 +07:00
|
|
|
- rm $(sbindir)/$(CONTROL)
|
2004-04-24 11:50:27 +07:00
|
|
|
- rm $(sbindir)/$(STARTER)
|
2004-03-03 14:49:08 +07:00
|
|
|
- rm $(usrbindir)/$(INFO)
|
2004-04-24 11:50:27 +07:00
|
|
|
- rm $(usrbindir)/$(TESTER)
|
2003-10-17 14:19:04 +07:00
|
|
|
- rmdir $(hotplugdir)
|
2004-11-06 20:28:01 +07:00
|
|
|
- rm -rf $(udevdb)
|
2003-10-17 14:19:04 +07:00
|
|
|
- rmdir $(udevdir)
|
2004-11-06 20:28:01 +07:00
|
|
|
- killall $(DAEMON)
|
2003-12-18 09:32:53 +07:00
|
|
|
@extras="$(EXTRAS)" ; for target in $$extras ; do \
|
2003-12-08 00:04:49 +07:00
|
|
|
echo $$target ; \
|
|
|
|
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
|
|
|
|
-C $$target $@ ; \
|
|
|
|
done ; \
|
2004-10-28 22:19:13 +07:00
|
|
|
|
|
|
|
test: all
|
2004-11-11 09:11:40 +07:00
|
|
|
@ cd test && ./udev-test.pl
|
2005-04-12 03:38:41 +07:00
|
|
|
@ cd test && ./udevstart-test.pl
|