summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreike-hotplug@sf-tec.de <eike-hotplug@sf-tec.de>2004-01-10 01:19:57 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:15 -0700
commite64280b8b30569ad6029e48f23d290e06a28d7ed (patch)
tree1fa2a1d2793bef21623825d5fed79e7ee71fdd1a /Makefile
parent[PATCH] added dri rule to the default config file. (diff)
downloadsystemd-e64280b8b30569ad6029e48f23d290e06a28d7ed.tar.gz
systemd-e64280b8b30569ad6029e48f23d290e06a28d7ed.tar.bz2
systemd-e64280b8b30569ad6029e48f23d290e06a28d7ed.zip
[PATCH] LSB init script and other stuff
I had too much time during the holidays, so I played a bit with udev. The changes are like last time mostly on the init stuff. I'm sending you this as a great diff which is just for comments. What it does: -fix a typo in Makefile -use only one "grep -v" instead of many -don't include BK-Files into release (shrinks the stuff to 30%!) -add a new init script which is LSB compliant -add some flags to choose which one to use -use /etc/udev/udev.conf in Redhat init script as the source for the udev directory. If this is not done then the init script may create a directory which udev itself isn't using (I changed /udev to /Udev to avoid collisions with /usr and ran into this) -first check for sysfs_dir before creating udev_root (maybe someone else has already fixed this, I saw this discussion on lkml)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ffd61c040..36f0272d0 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ udevdir = ${prefix}/udev
#USE_KLIBC = true
# If you are running a cross compiler, you may want to set this
-# to something more interesting, like "arm-linux-". I you want
+# to something more interesting, like "arm-linux-". If you want
# to compile vs uClibc, that can be done here as well.
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
CC = $(CROSS)gcc
@@ -231,7 +231,7 @@ clean:
-C $$target $@ ; \
done ; \
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys" | sort )
+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 )
DISTDIR := $(RELEASE_NAME)
srcdir = .
release: clean
@@ -292,13 +292,16 @@ install-config: $(GEN_CONFIGS)
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
fi
-
-
install: install-config install-dbus-policy all
$(INSTALL) -d $(DESTDIR)$(udevdir)
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
- $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev
+ @if [ "x$(USE_LSB)" = "xtrue" ]; then \
+ $(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev
+ ln -s $(DESTDIR)$(initdir)/udev $(sbin_dir)/rcudev
+ else
+ $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev
+ fi
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
- ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
@@ -324,5 +327,3 @@ uninstall: uninstall-dbus-policy
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-C $$target $@ ; \
done ; \
-
-