X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=942c8ccb1952dd00416fc300e72a26f7bc1a4649;hp=0b635ffb258e0dfced11688cfaf8cf24fc211473;hb=6fbecf3547a02be2475f275d6862ed9dcfcce2fe;hpb=e629ca3f499baae644deae8c151e86e052f02113

diff --git a/Makefile b/Makefile
index 0b635ffb2..942c8ccb1 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,7 @@ SENDER =	udevsend
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
-RULER =		udevruler
-WAIT =		wait_for_sysfs
-VERSION =	032_bk
+VERSION =	047
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -69,12 +67,17 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 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
 #USE_KLIBC = true
 
+# make the build silent (well, at least the udev part)  Set this
+# to something else to make it noisy again.
+V=false
+
 # set up PWD so that older versions of make will work with our build.
 PWD = $(shell pwd)
 
@@ -87,6 +90,7 @@ LD = $(CROSS)gcc
 AR = $(CROSS)ar
 STRIP = $(CROSS)strip
 RANLIB = $(CROSS)ranlib
+HOSTCC = gcc
 
 export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0
 
@@ -107,12 +111,7 @@ OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>
 # add -Wredundant-decls when libsysfs gets cleaned up
 WARNINGS := -Wall 
 
-CFLAGS := -pipe -Dasmlinkage=
-
-# set up the proper tdb spinlock code if we can
-ifeq ($(strip $(ARCH)),i386)
-	CFLAGS += -DUSE_SPINLOCKS -DINTEL_SPINLOCKS
-endif
+CFLAGS := -pipe
 
 ifeq ($(strip $(USE_LOG)),true)
 	CFLAGS  += -DLOG
@@ -133,25 +132,27 @@ endif
 # 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
 	LINUX_INCLUDE_DIR	:= $(KERNEL_DIR)/include
 	include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
 	# arch specific objects
-	ARCH_LIB_OBJS =	\
-			$(KLIBC_DIR)/libc.a
+	ARCH_LIB_OBJS =	 $(KLIBC_DIR)/libc.a
 
 
 	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
@@ -169,18 +170,20 @@ ifeq ($(strip $(USE_SELINUX)),true)
 	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
 
-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)" \
 			SYSFS="$(SYSFS)" \
 			KERNEL_DIR="$(KERNEL_DIR)" \
+			QUIET="@$(PWD)/ccdv" \
 			-C $$target $@ ; \
 	done ; \
 
@@ -192,51 +195,90 @@ $(CRT0):
 	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
-
-OBJS =	udev_lib.o	\
-	udev_config.o	\
-	udev-add.o	\
-	udev-remove.o	\
-	udevdb.o	\
-	namedev.o	\
-	namedev_parse.o	\
-	dev_d.o		\
-	$(SYSFS)	\
-	$(TDB)
-
-HEADERS =	udev.h		\
-		udev_lib.h	\
-		namedev.h	\
-		udev_version.h	\
-		udevdb.h	\
-		klibc_fixups.h	\
-		logging.h	\
-		selinux.h	\
-		list.h
+HEADERS = \
+	udev.h		\
+	udev_utils.h	\
+	namedev.h	\
+	udev_version.h	\
+	udev_db.h	\
+	udev_sysfs.h	\
+	logging.h	\
+	selinux.h	\
+	list.h
+
+SYSFS_OBJS = \
+	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
+
+UDEV_OBJS = \
+	udev_utils.o		\
+	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
+
+OBJS = \
+	libsysfs/sysfs.a	\
+	udev.a
 
 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
+
+	KLIBC_FIXUP_OBJS = \
+		klibc_fixups/klibc_fixups.o
+
+	OBJS += klibc_fixups/klibc_fixups.a
 endif
 
+ifeq ($(strip $(V)),false)
+	QUIET=@./ccdv
+	HOST_PROGS=ccdv
+else
+	QUIET=
+	HOST_PROGS=
+endif
+
+udev.a: $(UDEV_OBJS)
+	rm -f $@
+	$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
+	$(QUIET) $(RANLIB) $@
+
+libsysfs/sysfs.a: $(SYSFS_OBJS)
+	rm -f $@
+	$(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
+	$(QUIET) $(RANLIB) $@
+
+klibc_fixups/klibc_fixups.a: $(KLIBC_FIXUP_OBJS)
+	rm -f $@
+	$(QUIET) $(AR) cq $@ $(KLIBC_FIXUP_OBJS)
+	$(QUIET) $(RANLIB) $@
+
 # header files automatically generated
 GEN_HEADERS =	udev_version.h
 
+ccdv:
+	@echo "Building ccdv"
+	@$(HOSTCC) -O1 ccdv.c -o ccdv
+
 # Rules on how to create the generated header files
 udev_version.h:
+	@echo "Creating udev_version.h"
 	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
-	@echo \#define UDEV_ROOT		\"$(udevdir)/\" >> $@
-	@echo \#define UDEV_DB			\"$(udevdir)/.udev.tdb\" >> $@
+	@echo \#define UDEV_ROOT		\"$(udevdir)\" >> $@
+	@echo \#define UDEV_DB			\"$(udevdb)\" >> $@
 	@echo \#define UDEV_CONFIG_DIR		\"$(configdir)\" >> $@
 	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
@@ -255,47 +297,46 @@ GEN_MANPAGESIN = udev.8.in
 $(GEN_MANPAGES): $(GEN_MANPAGESIN)
 	sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
-
-$(OBJS): $(GEN_HEADERS)
-$(ROOT).o: $(GEN_HEADERS)
-$(TESTER).o: $(GEN_HEADERS)
-$(INFO).o: $(GEN_HEADERS)
-$(DAEMON).o: $(GEN_HEADERS)
-$(SENDER).o: $(GEN_HEADERS)
-$(STARTER).o: $(GEN_HEADERS)
-
-$(ROOT): $(LIBC) $(ROOT).o $(STARTER).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $@
+$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS)
+$(SYSFS_OBJS): $(HOST_PROGS)
+$(KLIBC_FIXUP_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)
+	$(QUIET) $(STRIPCMD) $@
 
 $(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $@
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(TESTER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
 
 $(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $@
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(INFO).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
 
 $(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $@
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(DAEMON).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
 
 $(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $@
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(SENDER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
 
-$(RULER): $(LIBC) $(RULER).o $(OBJS) $(HEADERS)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevruler.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) -lnewt
-	$(STRIPCMD) $@
+.c.o:
+	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
 
-$(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $@
 
 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) $(RULER) $(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 \
 		echo $$target ; \
@@ -307,10 +348,10 @@ spotless: clean
 	$(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 = .
-release: clean
+release: spotless
 	-rm -rf $(DISTDIR)
 	mkdir $(DISTDIR)
 	chmod 777 $(DISTDIR)
@@ -320,7 +361,7 @@ release: clean
 	@echo "$(RELEASE_NAME).tar.gz created"
 
 
-small_release: $(DISTFILES) clean
+small_release: $(DISTFILES) spotless
 #	@echo $(DISTFILES)
 	@-rm -rf $(DISTDIR)
 	@mkdir $(DISTDIR)
@@ -336,16 +377,6 @@ small_release: $(DISTFILES) clean
 	@rm -rf $(DISTDIR)
 	@echo "Built $(RELEASE_NAME).tar.gz"
 
-
-install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB
-	@if [ -f /etc/redhat-release ]; then \
-		$(INSTALL_DATA) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
-	elif [ -f /etc/SuSE-release ]; then \
-		$(INSTALL_DATA) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
-	elif [ -f /etc/debian_version ]; then \
-		$(INSTALL_DATA) -D etc/init.d/udev.debian $(DESTDIR)$(initdir)/udev; \
-	fi
-
 install-config:
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
 	$(INSTALL) -d $(DESTDIR)$(configdir)/permissions.d
@@ -388,7 +419,7 @@ uninstall-man:
 	- rm $(mandir)/man8/udevd.8
 	- rm $(mandir)/man8/udevsend.8
 
-install: install-initscript install-config install-man install-dev.d all
+install: install-config install-man install-dev.d all
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
 	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
 	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
@@ -396,13 +427,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 $(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)/$(WAIT) $(DESTDIR)$(hotplugdir)/05-wait_for_sysfs.hotplug
 ifndef DESTDIR
-	- killall udevd
-	- rm -f $(udevdir)/.udev.tdb
+	- killall $(DAEMON)
+	- rm -rf $(udevdb)
 endif
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -412,26 +441,27 @@ endif
 
 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
 	- rmdir $(configdir)/rules.d
 	- rmdir $(configdir)/permissions.d
 	- rmdir $(configdir)
-	- rm $(initdir)/udev
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(DAEMON)
 	- rm $(sbindir)/$(SENDER)
 	- rm $(sbindir)/$(STARTER)
 	- rm $(usrbindir)/$(INFO)
 	- rm $(usrbindir)/$(TESTER)
-	- rm $(usrbindir)/$(WAIT)
 	- rmdir $(hotplugdir)
-	- rm $(udevdir)/.udev.tdb
+	- rm -rf $(udevdb)
 	- rmdir $(udevdir)
+	- killall $(DAEMON)
 	@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