From: Date: Tue, 27 Sep 2005 15:12:09 +0000 (-0700) Subject: Merge branch 'master' from gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev X-Git-Tag: 174~2530 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9bd72b9b6b2645ea3c36ef0be9a070e8ff67904f;hp=af2703d39aaf924cbfdce5a41b498a0a025c34d1 Merge branch 'master' from gregkh@/linux/hotplug/udev --- diff --git a/udev.spec b/udev.spec deleted file mode 100644 index 2b8eb054c..000000000 --- a/udev.spec +++ /dev/null @@ -1,179 +0,0 @@ -# if we want to build against the included version of klibc or not. -# 0 - do not use klibc -# 1 - use klibc -# Watch out for where the linux symlink is in the klibc part of the tarball, -# it probably is not where you want it to be. -%define klibc 1 - -# if we want to have logging support in or not. -# 0 - no logging support -# 1 - logging support -# Note, it is not recommend if you use klibc to enable logging. -%define log 0 - -# if we want to enable debugging support in udev. If it is enabled, lots of -# stuff will get sent to the debug syslog. -# 0 - debugging disabled -# 1 - debugging enabled -%define debug 0 - -# if we want to build the scsi_id "extra" package or not -# 0 - do not build the package -# 1 - build it -%define scsi_id 1 - -# if we want to build the volume_id "extra" package or not -# 0 - do not build the package -# 1 - build it -%define volume_id 1 - -Summary: A userspace device manager providing devfs functionality -Name: udev -Version: 070 -Release: 1 -License: GPL -Group: Utilities/System -Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.gz -ExclusiveOS: Linux -Vendor: Greg Kroah-Hartman -URL : kernel.org/pub/linux/utils/kernel/hotplug/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Prereq: /bin/sh, fileutils, hotplug - -%description -udev is a userspace device manager, using sysfs and uevents -to provide a devfs-like device directory management and uevent -dispatching. - -%prep -%setup -q - -%build -make CC="gcc $RPM_OPT_FLAGS" \ -%if %{klibc} - USE_KLIBC=true \ -%endif -%if %{log} - USE_LOG=true \ -%else - USE_LOG=false \ -%endif -%if %{debug} - DEBUG=true \ -%else - DEBUG=false \ -%endif - EXTRAS=" \ -%if %{scsi_id} - extras/scsi_id \ -%endif -%if %{volume_id} - extras/volume_id \ -%endif -" - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install \ - EXTRAS=" \ -%if %{scsi_id} - extras/scsi_id \ -%endif -%if %{volume_id} - extras/volume_id \ -%endif -" - -%post -/sbin/chkconfig --add udev - -%postun -if [ $1 = 0 ]; then - /sbin/chkconfig --del udev -fi - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc COPYING README TODO ChangeLog HOWTO* docs/* -%doc etc/udev/udev.rules.{examples,gentoo,redhat} -%attr(755,root,root) /sbin/udev -%attr(755,root,root) /usr/bin/udevinfo -%attr(755,root,root) /sbin/udevsend -%attr(755,root,root) /sbin/udevd -%attr(755,root,root) /usr/bin/udevtest -%attr(755,root,root) /sbin/udevstart -%attr(755,root,root) %dir /udev/ -%attr(755,root,root) %dir /etc/udev/ -%config(noreplace) %attr(0644,root,root) /etc/udev/udev.conf -%attr(755,root,root) %dir /etc/udev/rules.d/ -%config(noreplace) %attr(0644,root,root) /etc/udev/rules.d/50-udev.rules -%attr(-,root,root) /etc/hotplug.d/default/udev.hotplug -%attr(755,root,root) /etc/init.d/udev -%attr(0644,root,root) %{_mandir}/man8/udev*.8* - -%if %{scsi_id} - %attr(755,root,root) /sbin/scsi_id - %config(noreplace) %attr(0644,root,root) /etc/scsi_id.config - %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8* -%endif -%if %{volume_id} - %attr(755,root,root) /sbin/udev_volume_id -%endif - -%changelog -* Fri May 14 2004 Greg Kroah-Hartman -- remove dbus and selinux stuff from here -- added volume_id option - -* Wed Mar 24 2004 Greg Kroah-Hartman -- change the way dbus and selinux support is built (now an extra) - -* Tue Mar 2 2004 Greg Kroah-Hartman -- added udevstart to the list of files installed -- udevinfo is now in /usr/bin not /sbin - -* Fri Feb 27 2004 Greg Kroah-Hartman -- added ability to build with SELinux support - -* Thu Feb 19 2004 Greg Kroah-Hartman -- add some more files to the documentation directory -- add ability to build scsi_id and make it the default - -* Mon Feb 16 2004 Greg Kroah-Hartman -- fix up udevd build, as it's no longer needed to be build seperatly -- add udevtest to list of files -- more Red Hat sync ups. - -* Thu Feb 12 2004 Greg Kroah-Hartman -- add some changes from the latest Fedora udev release. - -* Mon Feb 2 2004 Greg Kroah-Hartman -- add udevsend, and udevd to the files -- add ability to build udevd with glibc after the rest is build with klibc - -* Mon Jan 26 2004 Greg Kroah-Hartman -- added udevinfo to rpm -- added URL to spec file -- added udevinfo's man page - -* Mon Jan 05 2004 Rolf Eike Beer -- add defines to choose the init script (Redhat or LSB) - -* Tue Dec 16 2003 Robert Love -- install the initscript and run chkconfig on it - -* Tue Nov 2 2003 Greg Kroah-Hartman -- changes due to config file name changes - -* Fri Oct 17 2003 Robert Love -- Make work without a build root -- Correctly install the right files -- Pass the RPM_OPT_FLAGS to gcc so we can build per the build policy -- Put some prereqs in -- Install the hotplug symlink to udev - -* Mon Jul 28 2003 Paul Mundt -- Initial spec file for udev-0.2.