# Leave this set to `false' for production use.
DEBUG = false
-# Set the following to `true' to make udev emit a D-BUS signal when a
-# new node is created.
-USE_DBUS = false
-
ROOT = udev
DAEMON = udevd
TESTER = udevtest
STARTER = udevstart
RULER = udevruler
-VERSION = 022
+VERSION = 030
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
usrbindir = ${exec_prefix}/usr/bin
mandir = ${prefix}/usr/share/man
hotplugdir = ${etcdir}/hotplug.d/default
-dbusdir = ${etcdir}/dbus-1/system.d
-configdir = ${etcdir}/udev/
-initdir = ${etcdir}/init.d/
+configdir = ${etcdir}/udev
+initdir = ${etcdir}/init.d
+dev_ddir = ${etcdir}/dev.d
srcdir = .
INSTALL = /usr/bin/install -c
-e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
# code taken from uClibc to determine the gcc include dir
-GCCINCDIR := ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
+GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
# code taken from uClibc to determine the libgcc.a filename
GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
udevdb.o \
namedev.o \
namedev_parse.o \
+ dev_d.o \
$(SYSFS) \
$(TDB)
udev_lib.h \
namedev.h \
udev_version.h \
- udev_dbus.h \
udevdb.h \
klibc_fixups.h \
logging.h \
ifeq ($(strip $(USE_KLIBC)),true)
OBJS += klibc_fixups.o
+ KLIBC_FIXUP = klibc_fixups.o
endif
-ifeq ($(USE_DBUS), true)
- CFLAGS += -DUSE_DBUS
- CFLAGS += $(shell pkg-config --cflags dbus-1)
- LDFLAGS += $(shell pkg-config --libs dbus-1)
- OBJS += udev_dbus.o
-endif
-
-# if USE_SELINUX is enabled, then we do not strip or optimize
-ifeq ($(strip $(USE_SELINUX)),true)
- CFLAGS += -DUSE_SELINUX
- OBJS += udev_selinux.o
- LIB_OBJS += -lselinux
-endif
-
-
# header files automatically generated
GEN_HEADERS = udev_version.h
# Rules on how to create the generated header files
udev_version.h:
- @echo \#define UDEV_VERSION \"$(VERSION)\" > $@
- @echo \#define UDEV_ROOT \"$(udevdir)/\" >> $@
- @echo \#define UDEV_DB \"$(udevdir)/\.udev.tdb\" >> $@
- @echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@
- @echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@
- @echo \#define UDEV_RULES_FILE \"$(configdir)\udev.rules\" >> $@
- @echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@
- @echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@
- @echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@
- @echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@
+ @echo \#define UDEV_VERSION \"$(VERSION)\" > $@
+ @echo \#define UDEV_ROOT \"$(udevdir)/\" >> $@
+ @echo \#define UDEV_DB \"$(udevdir)/.udev.tdb\" >> $@
+ @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_PERMISSION_FILE \"$(configdir)/permissions.d\" >> $@
+ @echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@
+ @echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@
+ @echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
$(LOCAL_CFG_DIR)/udev.conf:
sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
+GEN_MANPAGES = udev.8
+GEN_MANPAGESIN = udev.8.in
+# Rules on how to create the man pages
+$(GEN_MANPAGES): $(GEN_MANPAGESIN)
+ sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
+
$(OBJS): $(GEN_HEADERS)
$(ROOT).o: $(GEN_HEADERS)
$(SENDER).o: $(GEN_HEADERS)
$(STARTER).o: $(GEN_HEADERS)
-$(ROOT): $(ROOT).o $(OBJS) $(HEADERS) $(LIBC)
+$(ROOT): $(ROOT).o $(OBJS) $(HEADERS) $(LIBC) $(GEN_MANPAGES)
$(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
-$(DAEMON): $(DAEMON).o udevd.h $(LIBC)
- $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(DAEMON): $(DAEMON).o $(OBJS) udevd.h $(LIBC)
+ $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $@
$(SENDER): $(SENDER).o udevd.h $(LIBC)
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
- -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(STARTER) $(RULER)
+ -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(STARTER) $(RULER)
$(MAKE) -C klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
@echo "Built $(RELEASE_NAME).tar.gz"
-ifeq ($(USE_DBUS), true)
-install-dbus-policy:
- $(INSTALL) -d $(DESTDIR)$(dbusdir)
- $(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
-
-uninstall-dbus-policy:
- - rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
-else
-install-dbus-policy:
- -
-uninstall-dbus-policy:
- -
-endif
-
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; \
fi
install-config: $(GEN_CONFIGS)
- $(INSTALL) -d $(DESTDIR)$(configdir)
- @if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \
+ $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
+ $(INSTALL) -d $(DESTDIR)$(configdir)/permissions.d
+ @if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
fi
- @if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
- echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
- $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
+ @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; \
fi
- @if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \
- echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
- $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
+ @if [ ! -r $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions ]; then \
+ echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
+ $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
fi
-install: install-initscript install-config install-dbus-policy all
+install-dev.d:
+ $(INSTALL) -d $(DESTDIR)$(dev_ddir)/default
+ $(INSTALL_PROGRAM) -D etc/dev.d/net/hotplug.dev $(DESTDIR)$(dev_ddir)/net/hotplug.dev
+
+uninstall-dev.d:
+ - rm $(dev_ddir)/net/hotplug.dev
+ - rmdir $(dev_ddir)/net
+ - rmdir $(dev_ddir)/default
+ - rmdir $(dev_ddir)
+
+install-man:
+ $(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
+
+install: install-initscript install-config install-man install-dev.d all
$(INSTALL) -d $(DESTDIR)$(udevdir)
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
- $(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
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
ifndef DESTDIR
- killall udevd
-C $$target $@ ; \
done ; \
-uninstall: uninstall-dbus-policy
+uninstall: uninstall-man uninstall-dev.d
- rm $(hotplugdir)/udev.hotplug
- - rm $(configdir)/udev.permissions
- - rm $(configdir)/udev.rules
+ - 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 $(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
- rm $(sbindir)/$(ROOT)
- rm $(sbindir)/$(DAEMON)
- rm $(sbindir)/$(SENDER)
+ - rm $(sbindir)/$(STARTER)
- rm $(usrbindir)/$(INFO)
+ - rm $(usrbindir)/$(TESTER)
- rmdir $(hotplugdir)
- - rmdir $(configdir)
- rm $(udevdir)/.udev.tdb
- rmdir $(udevdir)
@extras="$(EXTRAS)" ; for target in $$extras ; do \