[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/udev/devel udev-062.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.23, 1.24 sources, 1.22, 1.23 udev.rules, 1.27, 1.28 udev.spec, 1.92, 1.93 ata_identify-Makefile, 1.3, NONE ata_identify.c, 1.4, NONE udev-039-dircheck.patch, 1.1, NONE udev-039-media.patch, 1.1, NONE udev-039-static.patch, 1.3, NONE udev-048-selinux.patch, 1.1, NONE



Author: notting

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26364

Modified Files:
	.cvsignore sources udev.rules udev.spec 
Added Files:
	udev-062.tar.bz2.sign 
Removed Files:
	ata_identify-Makefile ata_identify.c udev-039-dircheck.patch 
	udev-039-media.patch udev-039-static.patch 
	udev-048-selinux.patch 
Log Message:
* Fri Jul 08 2005 Bill Nottingham <notting redhat com> - 062-1
- update to 062
- use included ata_id, build usb_id
- load modules for pci, usb, pcmcia




--- NEW FILE udev-062.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBCza1ZyGugalF9Dw4RAjVVAJ9LczvKlV33wqUkmI4hOoaLPvixFgCggFEr
DVjHrbmCm7uRq0QQg4d9guo=
=qNUt
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	21 May 2005 03:38:00 -0000	1.23
+++ .cvsignore	13 Jul 2005 14:33:07 -0000	1.24
@@ -1 +1 @@
-udev-058.tar.bz2
+udev-062.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	21 May 2005 03:38:00 -0000	1.22
+++ sources	13 Jul 2005 14:33:08 -0000	1.23
@@ -1 +1 @@
-03be2f56cc13c7f24b0ebf296166d48a  udev-058.tar.bz2
+1535a62e2ae9a6a1cdd6857f6fc3da33  udev-062.tar.bz2


Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- udev.rules	28 Jun 2005 08:09:46 -0000	1.27
+++ udev.rules	13 Jul 2005 14:33:08 -0000	1.28
@@ -232,3 +232,10 @@
 KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
 
 KERNEL=="dvb*", PROGRAM=="/etc/udev/scripts/dvb.sh %k", NAME="%c"
+
+ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \
+	RUN+="/sbin/modprobe $modalias"
+ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
+	RUN+="/sbin/modprobe $modalias"
+ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
+	RUN+="/sbin/modprobe $modalias"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- udev.spec	7 Jul 2005 13:36:42 -0000	1.92
+++ udev.spec	13 Jul 2005 14:33:08 -0000	1.93
@@ -6,8 +6,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 058
-Release: 2
+Version: 062
+Release: 1
 License: GPL
 Group: System Environment/Base
 %if !%{with_persistent}
@@ -20,9 +20,7 @@
 Source4: pam_console.dev
 Source5: MAKEDEV.dev
 
-Source11: ata_identify.c
-Source12: ata_identify-Makefile
-
+Source10: hotplug.rules
 Source13: udev.get_persistent_device_name.sh
 Source14: udev.get_unique_hardware_path.sh
 Source15: udev.get_unique_drive_id.sh
@@ -38,7 +36,7 @@
 
 Source23: udevpermconv.sh
 
-Patch1: udev-039-static.patch
+Patch1: udev-062-build.patch
 Patch50: udev-039-scsi_id-tmp_dir.patch
 
 ExclusiveOS: Linux
@@ -75,43 +73,30 @@
 %prep
 %setup -q  
 
-#%patch1 -p1 -b .glibcstatic
+%patch1 -p1 -b .build
 %patch50 -p1 -b .tmp_dir
 
-touch etc/init.d/udev.debian
-
-%if %{with_persistent}
-	mkdir ata_identify
-	cp %{SOURCE11} ata_identify
-	cp %{SOURCE12} ata_identify/Makefile
-%endif
-
 cp %{SOURCE21} .
 
 %build
 
 # Do not USE_LOG in udev.static, cause it causes segfaults on openlog (bug 136005)
-make CC="gcc $RPM_OPT_FLAGS -DUDEV_STATIC" LD="gcc $RPM_OPT_FLAGS -static" \
+make \
         USE_KLIBC=false \
         USE_SELINUX=true \
 	USE_STATIC=true \
 	udevdir="/dev" \
 	USE_LOG=false DEBUG=%{debug} \
-	EXTRAS="extras/scsi_id \
-%if %{with_persistent}
-	ata_identify \
-%endif
+	EXTRAS="extras/scsi_id extras/ata_id \
 	" all
 
 mv udev udev.static
 mv udevstart udevstart.static
 mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
-%if %{with_persistent}
-	mv ata_identify/ata_identify ata_identify/ata_identify.static
-%endif
+mv extras/ata_id/ata_id extras/ata_id/ata_id.static
 make clean
 
-make CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
+make \
         USE_KLIBC=false \
 	USE_SELINUX=true \
 	udevdir="/dev" \
@@ -120,9 +105,9 @@
 	EXTRAS="	\
         extras/scsi_id  \
         extras/chassis_id  \
-%if %{with_persistent}
-        ata_identify \
-%endif
+        extras/ata_id \
+	extras/usb_id \
+	extras/run_directory \
 	"
         #extras/volume_id  
 
@@ -135,9 +120,9 @@
 	EXTRAS="	\
 	extras/scsi_id	\
 	extras/chassis_id \
-%if %{with_persistent}
-        ata_identify \
-%endif
+        extras/ata_id \
+	extras/usb_id \
+	extras/run_directory \
 	"
 
 
@@ -149,20 +134,17 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
 
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
+# Backwards compat
+install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/hotplug.rules
 
 install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
 
-mv $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/net/hotplug.dev $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
-ln -s ../../udev/scripts/hotplug.dev $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/net/
 # obsoleted by selinux patch
 #install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default
 install -m 0755 udev.static $RPM_BUILD_ROOT/sbin/udev.static
 install -m 0755 udevstart.static $RPM_BUILD_ROOT/sbin/udevstart.static
 install -m 0755 extras/scsi_id/scsi_id.static $RPM_BUILD_ROOT/sbin/scsi_id.static
-%if %{with_persistent}
-	install -m 0755 ata_identify/ata_identify.static $RPM_BUILD_ROOT/sbin/ata_identify.static
-%endif
-
+install -m 0755 extras/ata_id/ata_id.static $RPM_BUILD_ROOT/sbin/ata_id.static
 
 %if %{with_persistent}
 #persistent
@@ -231,15 +213,21 @@
 %doc etc/udev/redhat/udev.rules
 %attr(0755,root,root) /sbin/udev
 %attr(0755,root,root) /sbin/udev.static
+%attr(0755,root,root) /sbin/udevcontrol
 %attr(0755,root,root) /sbin/udevsend
 %attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/udevstart
 %attr(0755,root,root) /sbin/udevstart.static
 %attr(0755,root,root) /sbin/start_udev
 #%attr(755,root,root) /sbin/udev_volume_id
+%attr(0755,root,root) /sbin/udev_run_devd
+%attr(0755,root,root) /sbin/udev_run_hotplugd
 %attr(755,root,root) /sbin/chassis_id
 %attr(755,root,root) /sbin/scsi_id
 %attr(755,root,root) /sbin/scsi_id.static
+%attr(755,root,root) /sbin/ata_id
+%attr(755,root,root) /sbin/ata_id.static
+%attr(755,root,root) /sbin/usb_id
 
 %attr(0755,root,root) %{_bindir}/udevtest
 %attr(0755,root,root) %{_bindir}/udevinfo
@@ -251,10 +239,8 @@
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
 %attr(0755,root,root) %{_sysconfdir}/udev/scripts/pam_console.dev
 %config(missingok) %{_sysconfdir}/dev.d/default/05-pam_console.dev
-%config(missingok) %{_sysconfdir}/dev.d/net/hotplug.dev
 
 %attr(0755,root,root) %dir %{_sysconfdir}/dev.d/default
-%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/net
 
 # floppy madness
 %attr(0755,root,root) %dir %{_sysconfdir}/dev.d/
@@ -265,7 +251,6 @@
 %config(missingok) %{_sysconfdir}/dev.d/fd?/*
 %attr(0755,root,root) %{_sysconfdir}/udev/scripts/MAKEDEV.dev
 
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/hotplug.dev
 %attr(0755,root,root) %{_sysconfdir}/udev/scripts/check-cdrom.sh
 %attr(0755,root,root) %{_sysconfdir}/udev/scripts/ide-media.sh
 %attr(0755,root,root) %{_sysconfdir}/udev/scripts/dvb.sh
@@ -273,6 +258,7 @@
 
 %config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
 %config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
+%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/hotplug.rules
 %config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
 
 #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
@@ -283,11 +269,6 @@
 
 %if %{with_persistent}
 %files -n udev-persistent
-	%if %{with_persistent}
-		%attr(0755,root,root) /sbin/ata_identify
-		%attr(0755,root,root) /sbin/ata_identify.static
-	%endif
-
 	%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/49-udev-persistent.rules
 	%attr(0755,root,root) /sbin/udev.get_persistent_device_name.sh
 	%attr(0755,root,root) /sbin/udev.get_unique_hardware_path.sh
@@ -296,6 +277,11 @@
 %endif
 
 %changelog
+* Fri Jul 08 2005 Bill Nottingham <notting redhat com> - 062-1
+- update to 062
+- use included ata_id, build usb_id
+- load modules for pci, usb, pcmcia
+
 * Thu Jul 07 2005 Harald Hoyer <harald redhat com> - 058-2
 - compile with pie
 


--- ata_identify-Makefile DELETED ---


--- ata_identify.c DELETED ---


--- udev-039-dircheck.patch DELETED ---


--- udev-039-media.patch DELETED ---


--- udev-039-static.patch DELETED ---


--- udev-048-selinux.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]