# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Set this to make use of syslog
+# Set this to make use of syslog.
USE_LOG = true
-# Set this to ad development debug messages
+# 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.
DEBUG = false
# Set this to include Security-Enhanced Linux support.
USE_SELINUX = false
-# Set this to comile with the local version of klibc instead of glibc.
+# Set this to comile with klibc instead of glibc.
USE_KLIBC = false
# Set this to create statically linked binaries.
ROOT = udev
DAEMON = udevd
SENDER = udevsend
+INITSENDER = udevinitsend
+RECORDER = udeveventrecorder
+CONTROL = udevcontrol
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
-VERSION = 054
-INSTALL_DIR = /usr/local/bin
+VERSION = 058
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
-HOTPLUG_EXEC = $(ROOT)
DESTDIR =
KERNEL_DIR = /lib/modules/${shell uname -r}/build
RANLIB = $(CROSS)ranlib
HOSTCC = gcc
-export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0
+export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS
# 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/' \
# 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;}
-WARNINGS := -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
-WARNINGS += $(call cc-supports,-Wno-pointer-sign)
-WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
-
-CFLAGS := -pipe
+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
HEADERS = \
udev.h \
udev_utils.h \
- namedev.h \
+ udev_rules.h \
udev_version.h \
udev_db.h \
udev_sysfs.h \
udev_config.o \
udev_add.o \
udev_remove.o \
- udev_start.o \
udev_sysfs.o \
udev_db.o \
- udev_multiplex.o \
- namedev.o \
- namedev_parse.o \
+ udev_rules.o \
+ udev_rules_parse.o \
udev_libc_wrapper.o
OBJS = \
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE
- LDFLAGS += -Wl,-warn-common
+ CFLAGS += -O1 -g -DDEBUG
+ LDFLAGS += -Wl
STRIPCMD = /bin/true -Since_we_are_debugging
else
- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
- LDFLAGS += -s -Wl,-warn-common
+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
+ LDFLAGS += -s -Wl
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif
# If we are using our version of klibc, then we need to build, link it, and then
# link udev against it statically. Otherwise, use glibc and link dynamically.
ifeq ($(strip $(USE_KLIBC)),true)
- KLIBC_BASE = $(PWD)/klibc
- KLIBC_DIR = $(KLIBC_BASE)/klibc
- INCLUDE_DIR := $(KLIBC_BASE)/include
- LINUX_INCLUDE_DIR := $(KERNEL_DIR)/include
- include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
- ARCH_LIB_OBJS = $(KLIBC_DIR)/libc.a
- CRT0 = $(KLIBC_DIR)/crt0.o
- LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
- CFLAGS += $(WARNINGS) -nostdinc \
- $(OPTFLAGS) $(REQFLAGS) \
- -D__KLIBC__ -fno-builtin-printf \
- -I$(INCLUDE_DIR) \
- -I$(INCLUDE_DIR)/arch/$(ARCH) \
- -I$(INCLUDE_DIR)/bits$(BITSIZE) \
- -I$(GCCINCDIR) \
- -I$(LINUX_INCLUDE_DIR)
- LIB_OBJS =
- LDFLAGS = -static -nostdlib -nostartfiles -nodefaultlibs
+ KLIBC_INSTALL = $(PWD)/klibc/.install
+ KLCC = $(KLIBC_INSTALL)/bin/klcc
+ CC = $(KLCC)
+ LD = $(KLCC)
else
- WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
- CRT0 =
- LIBC =
- CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
- LIB_OBJS = -lc
+ CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
endif
ifeq ($(strip $(USE_SELINUX)),true)
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
-all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(GEN_CONFIGS)
+all: $(ROOT) $(SENDER) $(INITSENDER) $(RECORDER) $(CONTROL) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) \
-C $$target $@ ; \
done ; \
-$(ARCH_LIB_OBJS) : $(CRT0)
-
-$(CRT0):
- @if [ ! -r klibc/linux ]; then \
- ln -f -s $(KERNEL_DIR) klibc/linux; \
- fi
- $(MAKE) -C klibc SUBDIRS=klibc TESTS=
+$(KLCC):
+ $(MAKE) -j1 -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
+ SHLIBDIR=$(KLIBC_INSTALL)/lib \
+ INSTALLDIR=$(KLIBC_INSTALL) \
+ bindir=$(KLIBC_INSTALL)/bin \
+ mandir=$(KLIBC_INSTALL)/man all install
+ -find $(KLIBC_INSTALL)/include -name SCCS -print| xargs rm -rf
udev.a: $(UDEV_OBJS)
rm -f $@
@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_LOG_DEFAULT \"yes\" >> $@
- @echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@
- @echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@
+ @echo \#define UDEV_BIN \"$(sbindir)/udev\" >> $@
+ @echo \#define UDEVD_BIN \"$(sbindir)/udevd\" >> $@
# Rules on how to create the generated config files
$(LOCAL_CFG_DIR)/udev.conf:
$(GEN_MANPAGES): $(GEN_MANPAGESIN)
sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
-$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS)
-$(SYSFS_OBJS): $(HOST_PROGS)
-$(OBJS): $(GEN_HEADERS) $(HOST_PROGS)
-$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS)
-
-$(ROOT): $(LIBC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(ROOT).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(UDEV_OBJS): $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(SYSFS_OBJS): $(HEADERS) $(HOST_PROGS) $(KLCC)
+$(OBJS): $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(ROOT).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(TESTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(INFO).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(DAEMON).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(SENDER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(INITSENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(RECORDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(CONTROL).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(STARTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+
+$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(ROOT).o $(OBJS) $(LIB_OBJS)
+ $(QUIET) $(STRIPCMD) $@
+
+$(TESTER): $(KLCC) $(TESTER).o $(OBJS) $(HEADERS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(TESTER).o $(OBJS) $(LIB_OBJS)
+ $(QUIET) $(STRIPCMD) $@
+
+$(INFO): $(KLCC) $(INFO).o $(OBJS) $(HEADERS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(INFO).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
-$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(TESTER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(DAEMON): $(KLCC) $(DAEMON).o $(OBJS) udevd.h
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(DAEMON).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
-$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(INFO).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(SENDER): $(KLCC) $(SENDER).o $(OBJS) udevd.h
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(SENDER).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
-$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(DAEMON).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(INITSENDER): $(KLCC) $(INITSENDER).o $(OBJS) udevd.h
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(INITSENDER).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
-$(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(SENDER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(RECORDER): $(KLCC) $(RECORDER).o $(OBJS) udevd.h
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(RECORDER).o $(OBJS) $(LIB_OBJS)
+ $(QUIET) $(STRIPCMD) $@
+
+$(CONTROL): $(KLCC) $(CONTROL).o $(OBJS) udevd.h
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CONTROL).o $(OBJS) $(LIB_OBJS)
+ $(QUIET) $(STRIPCMD) $@
+
+$(STARTER): $(KLCC) $(STARTER).o $(OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(STARTER).o $(OBJS) $(LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
.c.o:
$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
-
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
- -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER)
+ -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
+ $(SENDER) $(INITSENDER) $(RECORDER) $(CONTROL) $(TESTER) $(STARTER)
-rm -f ccdv
$(MAKE) -C klibc SUBDIRS=klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
spotless: clean
$(MAKE) -C klibc SUBDIRS=klibc spotless
- -rm -f klibc/linux
+ rm -rf klibc/.install
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz" -e "\/\." -e releases -e BitKeeper -e SCCS -e test/sys | sort )
-DISTDIR := $(RELEASE_NAME)
-srcdir = .
release: spotless
- -rm -rf $(DISTDIR)
- mkdir $(DISTDIR)
- chmod 777 $(DISTDIR)
- bk export -w $(DISTDIR)
- tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
- rm -rf $(DISTDIR)
+ git-tar-tree HEAD $(RELEASE_NAME) | gzip -9v > $(RELEASE_NAME).tar.gz
@echo "$(RELEASE_NAME).tar.gz created"
-
-small_release: $(DISTFILES) spotless
-# @echo $(DISTFILES)
- @-rm -rf $(DISTDIR)
- @mkdir $(DISTDIR)
- @-chmod 777 $(DISTDIR)
- @for file in $(DISTFILES); do \
- if test -d $$file; then \
- mkdir $(DISTDIR)/$$file; \
- else \
- cp -p $$file $(DISTDIR)/$$file; \
- fi; \
- done
- @tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
- @rm -rf $(DISTDIR)
- @echo "Built $(RELEASE_NAME).tar.gz"
-
install-config:
$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
+ $(INSTALL_PROGRAM) -D $(INITSENDER) $(DESTDIR)$(sbindir)/$(INITSENDER)
+ $(INSTALL_PROGRAM) -D $(RECORDER) $(DESTDIR)$(sbindir)/$(RECORDER)
+ $(INSTALL_PROGRAM) -D $(CONTROL) $(DESTDIR)$(sbindir)/$(CONTROL)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
- - ln -f -s $(sbindir)/udev $(DESTDIR)$(sbindir)/$(STARTER)
+ $(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
ifndef DESTDIR
- killall $(DAEMON)
+ - $(sbindir)/$(DAEMON) --daemon
- rm -rf $(udevdb)
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
- rm $(sbindir)/$(ROOT)
- rm $(sbindir)/$(DAEMON)
- rm $(sbindir)/$(SENDER)
+ - rm $(sbindir)/$(INITSENDER)
+ - rm $(sbindir)/$(RECORDER)
+ - rm $(sbindir)/$(CONTROL)
- rm $(sbindir)/$(STARTER)
- rm $(usrbindir)/$(INFO)
- rm $(usrbindir)/$(TESTER)
test: all
@ cd test && ./udev-test.pl
+ @ cd test && ./udevstart-test.pl
~ianmdlvl / elogind.git / blobdiff