chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] rename udev_lib to udev_utils and dev_d to udev_multiplex
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index fd46a93a4135c482f24ae3184ad47835fbf8adf8..4d48b3c9e0779b58227a48f4e28b5bb139421534 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-34,8
+34,7
@@
SENDER = udevsend
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
-WAIT = wait_for_sysfs
-VERSION = 038
+VERSION = 046
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
@@
-68,7
+67,8
@@
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
EXTRAS=
# place to put our device nodes
EXTRAS=
# place to put our device nodes
-udevdir = ${prefix}/udev
+udevdir = ${prefix}/udev
+udevdb = ${udevdir}/.udevdb
# Comment out this line to build with something other
# than the local version of klibc
# Comment out this line to build with something other
# than the local version of klibc
@@
-113,11
+113,6
@@
WARNINGS := -Wall
CFLAGS := -pipe
CFLAGS := -pipe
-# set up the proper tdb spinlock code if we can
-ifeq ($(strip $(ARCH)),i386)
- CFLAGS += -DUSE_SPINLOCKS -DINTEL_SPINLOCKS
-endif
-
ifeq ($(strip $(USE_LOG)),true)
CFLAGS += -DLOG
endif
ifeq ($(strip $(USE_LOG)),true)
CFLAGS += -DLOG
endif
@@
-137,6
+132,7
@@
endif
# link udev against it statically.
# Otherwise, use glibc and link dynamically.
ifeq ($(strip $(USE_KLIBC)),true)
# link udev against it statically.
# Otherwise, use glibc and link dynamically.
ifeq ($(strip $(USE_KLIBC)),true)
+ KLIBC_FIXUPS_DIR= $(PWD)/klibc_fixups
KLIBC_BASE = $(PWD)/klibc
KLIBC_DIR = $(KLIBC_BASE)/klibc
INCLUDE_DIR := $(KLIBC_BASE)/include
KLIBC_BASE = $(PWD)/klibc
KLIBC_DIR = $(KLIBC_BASE)/klibc
INCLUDE_DIR := $(KLIBC_BASE)/include
@@
-149,13
+145,15
@@
ifeq ($(strip $(USE_KLIBC)),true)
CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
- CFLAGS += $(WARNINGS) -nostdinc \
- $(OPTFLAGS) \
- -D__KLIBC__ -fno-builtin-printf \
- -I$(INCLUDE_DIR) \
- -I$(INCLUDE_DIR)/arch/$(ARCH) \
- -I$(INCLUDE_DIR)/bits$(BITSIZE) \
- -I$(GCCINCDIR) \
+ CFLAGS += $(WARNINGS) -nostdinc \
+ $(OPTFLAGS) \
+ -D__KLIBC__ -fno-builtin-printf \
+ -I$(KLIBC_FIXUPS_DIR) \
+ -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \
+ -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
-I$(LINUX_INCLUDE_DIR)
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
@@
-173,17
+171,20
@@
ifeq ($(strip $(USE_SELINUX)),true)
LIB_OBJS += -lselinux
endif
LIB_OBJS += -lselinux
endif
-CFLAGS += -I$(PWD)/libsysfs
+CFLAGS += -I$(PWD)/libsysfs/sysfs \
+ -I$(PWD)/libsysfs
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
-all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(
WAIT) $(
GEN_CONFIGS)
+all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(GEN_CONFIGS)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) \
LD="$(LD)" \
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) \
LD="$(LD)" \
+ SYSFS="$(SYSFS)" \
KERNEL_DIR="$(KERNEL_DIR)" \
KERNEL_DIR="$(KERNEL_DIR)" \
+ QUIET="@$(PWD)/ccdv" \
-C $$target $@ ; \
done ; \
-C $$target $@ ; \
done ; \
@@
-195,41
+196,43
@@
$(CRT0):
fi
$(MAKE) -C klibc SUBDIRS=klibc
fi
$(MAKE) -C klibc SUBDIRS=klibc
-TDB = tdb/tdb.o \
- tdb/spinlock.o
+SYSFS = $(PWD)/libsysfs/sysfs_bus.o \
+ $(PWD)/libsysfs/sysfs_class.o \
+ $(PWD)/libsysfs/sysfs_device.o \
+ $(PWD)/libsysfs/sysfs_dir.o \
+ $(PWD)/libsysfs/sysfs_driver.o \
+ $(PWD)/libsysfs/sysfs_utils.o \
+ $(PWD)/libsysfs/dlist.o
-SYSFS = libsysfs/sysfs_bus.o \
- libsysfs/sysfs_class.o \
- libsysfs/sysfs_device.o \
- libsysfs/sysfs_dir.o \
- libsysfs/sysfs_driver.o \
- libsysfs/sysfs_utils.o \
- libsysfs/dlist.o
-
-OBJS = udev_lib.o \
+OBJS = udev_utils.o \
udev_config.o \
udev_add.o \
udev_remove.o \
udev_config.o \
udev_add.o \
udev_remove.o \
- udevdb.o \
+ udev_start.o \
+ udev_sysfs.o \
+ udev_db.o \
+ udev_multiplex.o\
namedev.o \
namedev_parse.o \
namedev.o \
namedev_parse.o \
- dev_d.o \
- $(SYSFS) \
- $(TDB)
+ $(SYSFS)
HEADERS = udev.h \
HEADERS = udev.h \
- udev_
lib.h
\
+ udev_
utils.h
\
namedev.h \
udev_version.h \
namedev.h \
udev_version.h \
- udev
db.h
\
-
klibc_fixups.h
\
+ udev
_db.h
\
+
udev_sysfs.h
\
logging.h \
selinux.h \
list.h
ifeq ($(strip $(USE_KLIBC)),true)
logging.h \
selinux.h \
list.h
ifeq ($(strip $(USE_KLIBC)),true)
- OBJS += klibc_fixups.o
- KLIBC_FIXUP = klibc_fixups.o
+ HEADERS += klibc_fixups/klibc_fixups.h \
+ klibc_fixups/mntent.h \
+ klibc_fixups/pwd.h
+
+ OBJS += klibc_fixups/klibc_fixups.o
+ KLIBC_FIXUP = klibc_fixups/klibc_fixups.o
endif
ifeq ($(strip $(V)),false)
endif
ifeq ($(strip $(V)),false)
@@
-251,8
+254,8
@@
ccdv:
udev_version.h:
@echo "Creating udev_version.h"
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
udev_version.h:
@echo "Creating udev_version.h"
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
- @echo \#define UDEV_ROOT \"$(udevdir)
/
\" >> $@
- @echo \#define UDEV_DB \"$(udevd
ir)/.udev.tdb
\" >> $@
+ @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
+ @echo \#define UDEV_DB \"$(udevd
b)
\" >> $@
@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_CONFIG_DIR \"$(configdir)\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
@@
-278,10
+281,9
@@
$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS)
$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS)
$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS)
$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS)
$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS)
$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(WAIT).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(ROOT): $(LIBC) $(ROOT).o $(
STARTER).o $(
OBJS) $(HEADERS) $(GEN_MANPAGES)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o
udevstart.o
$(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(ROOT): $(LIBC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
$(QUIET) $(STRIPCMD) $@
$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
@@
-289,19
+291,15
@@
$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
$(QUIET) $(STRIPCMD) $@
$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
$(QUIET) $(STRIPCMD) $@
$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_
lib.o udev_config.o udevdb.o $(SYSFS) $(TDB
) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_
utils.o udev_config.o udev_db.o $(SYSFS
) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
$(QUIET) $(STRIPCMD) $@
$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_
lib
.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_
utils
.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
$(QUIET) $(STRIPCMD) $@
$(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
- $(QUIET) $(STRIPCMD) $@
-
-$(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
#.c.o:
$(QUIET) $(STRIPCMD) $@
#.c.o:
@@
-313,7
+311,7
@@
$(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
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)
$(WAIT)
+ -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER)
-rm -f ccdv
$(MAKE) -C klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
-rm -f ccdv
$(MAKE) -C klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@
-326,10
+324,10
@@
spotless: clean
$(MAKE) -C klibc spotless
-rm -f klibc/linux
$(MAKE) -C klibc spotless
-rm -f klibc/linux
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz
$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$"
-e test/sys | sort )
+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 = .
DISTDIR := $(RELEASE_NAME)
srcdir = .
-release:
clean
+release:
spotless
-rm -rf $(DISTDIR)
mkdir $(DISTDIR)
chmod 777 $(DISTDIR)
-rm -rf $(DISTDIR)
mkdir $(DISTDIR)
chmod 777 $(DISTDIR)
@@
-339,7
+337,7
@@
release: clean
@echo "$(RELEASE_NAME).tar.gz created"
@echo "$(RELEASE_NAME).tar.gz created"
-small_release: $(DISTFILES)
clean
+small_release: $(DISTFILES)
spotless
# @echo $(DISTFILES)
@-rm -rf $(DISTDIR)
@mkdir $(DISTDIR)
# @echo $(DISTFILES)
@-rm -rf $(DISTDIR)
@mkdir $(DISTDIR)
@@
-413,13
+411,11
@@
install: install-initscript install-config install-man install-dev.d all
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
- $(INSTALL_PROGRAM) -D $(WAIT) $(DESTDIR)$(sbindir)/$(WAIT)
- ln -f -s $(sbindir)/udev $(DESTDIR)$(sbindir)/$(STARTER)
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
- ln -f -s $(sbindir)/udev $(DESTDIR)$(sbindir)/$(STARTER)
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
- - ln -f -s $(sbindir)/$(WAIT) $(DESTDIR)$(hotplugdir)/05-wait_for_sysfs.hotplug
ifndef DESTDIR
ifndef DESTDIR
- - killall
udevd
- - rm -
f $(udevdir)/.udev.tdb
+ - killall
$(DAEMON)
+ - rm -
rf $(udevdb)
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@@
-429,7
+425,6
@@
endif
uninstall: uninstall-man uninstall-dev.d
- rm $(hotplugdir)/10-udev.hotplug
uninstall: uninstall-man uninstall-dev.d
- rm $(hotplugdir)/10-udev.hotplug
- - rm $(hotplugdir)/05-wait_for_sysfs.hotplug
- rm $(configdir)/rules.d/50-udev.rules
- rm $(configdir)/permissions.d/50-udev.permissions
- rm $(configdir)/udev.conf
- rm $(configdir)/rules.d/50-udev.rules
- rm $(configdir)/permissions.d/50-udev.permissions
- rm $(configdir)/udev.conf
@@
-443,12
+438,15
@@
uninstall: uninstall-man uninstall-dev.d
- rm $(sbindir)/$(STARTER)
- rm $(usrbindir)/$(INFO)
- rm $(usrbindir)/$(TESTER)
- rm $(sbindir)/$(STARTER)
- rm $(usrbindir)/$(INFO)
- rm $(usrbindir)/$(TESTER)
- - rm $(usrbindir)/$(WAIT)
- rmdir $(hotplugdir)
- rmdir $(hotplugdir)
- - rm
$(udevdir)/.udev.tdb
+ - rm
-rf $(udevdb)
- rmdir $(udevdir)
- rmdir $(udevdir)
+ - killall $(DAEMON)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-C $$target $@ ; \
done ; \
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-C $$target $@ ; \
done ; \
+
+test: all
+ @ cd test && ./udev-test.pl