Hello community,
here is the log from the commit of package udev
checked in at Wed Jun 14 13:28:55 CEST 2006.
--------
--- udev/udev.changes 2006-06-01 13:02:52.000000000 +0200
+++ udev/udev.changes 2006-06-14 12:17:30.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 12 10:20:55 CEST 2006 - kay.sievers@suse.de
+
+- update from upstream version 085 to 094
+ (integrating previous patches)
+- split off libvolume_id package
+- /sbin/*id moved to /lib/udev
+
+-------------------------------------------------------------------
Old:
----
allow-comma-01.patch
firmware.sh
fix-queue-export-01.patch
path_id
udev-085.tar.bz2
udev-catch-online-event-01.patch
udev-edd_id-NULL-01.patch
udev-export-seqnum-02.patch
udev-initial-seqnum-01.patch
udev-mkdir-udev-dir-01.patch
udev-netware-01.patch
udev-nss-different-uuid-01.patch
udev-offsetof-01.patch
udevtrigger-01.patch
udevtrigger-fix-order-01.patch
New:
----
udev-094.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ udev.spec ++++++
--- /var/tmp/diff_new_pack.kkUc2Q/_old 2006-06-14 13:28:40.000000000 +0200
+++ /var/tmp/diff_new_pack.kkUc2Q/_new 2006-06-14 13:28:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package udev (Version 085)
+# spec file for package udev (Version 094)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,31 +12,18 @@
Name: udev
URL: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
-Version: 085
-Release: 35
+Version: 094
+Release: 1
License: GPL
Group: System/Kernel
Summary: A rule based device node and kernel event manager
PreReq: /bin/rm %insserv_prereq %fillup_prereq
+Requires: libvolume_id
Provides: hotplug
Obsoletes: hotplug
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-Patch1: fix-queue-export-01.patch
-Patch3: udevtrigger-01.patch
-Patch4: allow-comma-01.patch
-Patch5: udev-export-seqnum-02.patch
-Patch6: udevtrigger-fix-order-01.patch
-Patch7: udev-initial-seqnum-01.patch
-Patch8: udev-mkdir-udev-dir-01.patch
-Patch9: udev-offsetof-01.patch
-Patch10: udev-netware-01.patch
-Patch11: udev-edd_id-NULL-01.patch
-Patch12: udev-nss-different-uuid-01.patch
-Patch13: udev-catch-online-event-01.patch
-#
-Source1: path_id
#
# rules
Source9: 05-udev-early.rules
@@ -48,7 +35,6 @@
#
# rule helper
Source26: load_floppy_module.sh
-Source29: firmware.sh
#
# system
Source60: boot.udev
@@ -74,30 +60,58 @@
Greg Kroah-Hartman
Kay Sievers
-%define extras "extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/dasd_id extras/cdrom_id extras/floppy"
+%package -n libvolume_id-devel
+Summary: A rule based device node and kernel event manager
+Group: System/Kernel
+Requires: libvolume_id = %{version}-%{release}
+
+%description -n libvolume_id-devel
+Udev's main task is to create and remove device nodes in /dev when a
+device is discovered or removed from the system. udevd receives all
+hotplug events via kernel netlink messages and dispatches them
+according to rules in /etc/udev/rules.d/. Matching rules may name a
+device node, create additional symlinks to the node, call tools to
+initialize a device or load needed kernel modules. See documentation in
+/usr/share/doc/packages/udev.
+
+
+
+Authors:
+--------
+ Greg Kroah-Hartman
+ Kay Sievers
+
+%package -n libvolume_id
+Summary: A rule based device node and kernel event manager
+Group: System/Kernel
+
+%description -n libvolume_id
+Udev's main task is to create and remove device nodes in /dev when a
+device is discovered or removed from the system. udevd receives all
+hotplug events via kernel netlink messages and dispatches them
+according to rules in /etc/udev/rules.d/. Matching rules may name a
+device node, create additional symlinks to the node, call tools to
+initialize a device or load needed kernel modules. See documentation in
+/usr/share/doc/packages/udev.
+
+
+
+Authors:
+--------
+ Greg Kroah-Hartman
+ Kay Sievers
+
+%define extras "extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/dasd_id extras/cdrom_id extras/floppy extras/path_id extras/firmware"
%prep
%setup
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
%build
-make V=1 EXTRAS=%{extras} STRIPCMD= OPTFLAGS="${RPM_OPT_FLAGS}" all
+make V=1 libdir=/%{_lib} usrlibdir=%{_libdir} OPTFLAGS="${RPM_OPT_FLAGS}" EXTRAS=%{extras} all
%install
-make V=1 EXTRAS=%{extras} DESTDIR=$RPM_BUILD_ROOT install
+make V=1 DESTDIR=$RPM_BUILD_ROOT libdir=/%{_lib} usrlibdir=%{_libdir} EXTRAS=%{extras} install
ln -sf /sbin/udevsettle ${RPM_BUILD_ROOT}/usr/bin/udev.count_events
install -m755 -D extras/eventrecorder.sh ${RPM_BUILD_ROOT}/lib/udev/eventrecorder.sh
-install -m755 -D extras/path_id ${RPM_BUILD_ROOT}/sbin/path_id
install -m644 -D extras/scsi_id/README ../doc/scsi_id/README
install -m644 -D extras/volume_id/README ../doc/vol_id/README
install -m644 -D FAQ ../doc/FAQ
@@ -106,13 +120,6 @@
install -m644 -D RELEASE-NOTES ../doc/RELEASE-NOTES
install -m644 -D ChangeLog ../doc/ChangeLog
#
-# overwrite
-install -m755 -D %{S:1} $RPM_BUILD_ROOT/sbin/path_id
-#
-# install lib
-install -m644 -D extras/volume_id/libvolume_id/volume_id.h $RPM_BUILD_ROOT/usr/include/volume_id.h
-install -m755 -D extras/volume_id/libvolume_id/libvolume_id.a $RPM_BUILD_ROOT/%{_libdir}/libvolume_id.a
-#
# install rules
install -m644 -D %{S:9} $RPM_BUILD_ROOT/etc/udev/rules.d/05-udev-early.rules
install -m644 -D %{S:11} $RPM_BUILD_ROOT/etc/udev/rules.d/50-udev-default.rules
@@ -123,7 +130,6 @@
#
# install stuff from package
install -m755 -D %{S:26} $RPM_BUILD_ROOT/lib/udev/load_floppy_module.sh
-install -m755 -D %{S:29} $RPM_BUILD_ROOT/lib/udev/firmware.sh
#
install -m755 -D %{S:60} $RPM_BUILD_ROOT/etc/init.d/boot.udev
install -m755 -D %{S:61} $RPM_BUILD_ROOT/etc/init.d/boot.udev_retry
@@ -169,14 +175,15 @@
/usr/sbin/udevmonitor
#
# id programs
-/sbin/ata_id
-/sbin/cdrom_id
-/sbin/dasd_id
-/sbin/edd_id
-/sbin/path_id
+/lib/udev/ata_id
+/lib/udev/cdrom_id
+/lib/udev/dasd_id
+/lib/udev/edd_id
+/lib/udev/path_id
+/lib/udev/usb_id
+/lib/udev/vol_id
+/lib/udev/scsi_id
/sbin/scsi_id
-/sbin/usb_id
-/sbin/vol_id
#
# helper
%dir /lib/udev
@@ -185,10 +192,6 @@
/lib/udev/firmware.sh
/lib/udev/load_floppy_module.sh
#
-# lib
-/usr/include/volume_id.h
-%{_libdir}/libvolume_id.a
-#
# config
%dir /etc/udev
%config /etc/udev/rules.d
@@ -198,8 +201,7 @@
%config /etc/init.d/boot.udev_retry
#
# documentation
-%{_mandir}/man7/*
-%{_mandir}/man8/*
+%{_mandir}/man?/*.[0-9]*
%doc doc/*
#
# static devices, copied into /dev at every bootup
@@ -241,7 +243,23 @@
%attr(600,root,root) %dev(c,10,200) /lib/udev/devices/skip
%attr(600,root,root) %dev(c,10,200) /lib/udev/devices/fwmonitor
+%files -n libvolume_id-devel
+%defattr(-,root,root)
+%{_includedir}/libvolume_id.h
+%{_libdir}/libvolume_id.a
+%{_libdir}/libvolume_id.so
+%{_libdir}/pkgconfig/libvolume_id.pc
+
+%files -n libvolume_id
+%defattr(-,root,root)
+/%{_lib}/libvolume_id.so.*
+
%changelog -n udev
+* Mon Jun 12 2006 - kay.sievers@suse.de
+- update from upstream version 085 to 094
+ (integrating previous patches)
+- split off libvolume_id package
+- /sbin/*id moved to /lib/udev
* Thu Jun 01 2006 - kay.sievers@suse.de
- wait for sysfs for net devices (#165050)
- switch to "online" events for device mapper devices (#175972)
++++++ 05-udev-early.rules ++++++
--- udev/05-udev-early.rules 2006-06-01 12:59:13.000000000 +0200
+++ udev/05-udev-early.rules 2006-03-08 18:59:29.000000000 +0100
@@ -1,5 +1,4 @@
# sysfs is populated after the event is sent
ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
++++++ 60-persistent-input.rules ++++++
--- udev/60-persistent-input.rules 2006-05-25 15:42:08.000000000 +0200
+++ udev/60-persistent-input.rules 2006-05-23 16:25:47.000000000 +0200
@@ -3,7 +3,7 @@
KERNEL=="input[0-9]*", GOTO="persistent_input_end"
# usb devices
-BUS=="usb", IMPORT{program}="/sbin/usb_id -x"
+BUS=="usb", IMPORT{program}="usb_id -x"
BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd"
BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse"
@@ -12,7 +12,7 @@
KERNEL=="event*", ENV{ID_BUS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-$env{ID_CLASS}"
# by-path
-IMPORT{program}="/sbin/path_id %p"
+IMPORT{program}="path_id %p"
ENV{ID_PATH}=="?*", KERNEL=="mouse*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
ENV{ID_PATH}=="?*", KERNEL=="event*", SYMLINK+="input/by-path/$env{ID_PATH}-event-$env{ID_CLASS}"
++++++ 60-persistent-storage.rules ++++++
--- udev/60-persistent-storage.rules 2006-06-01 10:56:25.000000000 +0200
+++ udev/60-persistent-storage.rules 2006-06-12 09:35:01.000000000 +0200
@@ -15,33 +15,33 @@
KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
# by-id (hardware serial number)
-KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode"
+KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode"
KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
KERNEL=="sd*[!0-9]|sr*|st*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/usb_id -x"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -s %p -d $tempnode"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -a -s %p -d $tempnode"
-KERNEL=="dasd*[!0-9]", IMPORT{program}="/sbin/dasd_id --export $tempnode"
+KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="usb_id -x"
+KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -s %p -d $tempnode"
+KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -a -s %p -d $tempnode"
+KERNEL=="dasd*[!0-9]", IMPORT{program}="dasd_id --export $tempnode"
KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
KERNEL=="st*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
# by-path (shortest physical path)
-KERNEL=="*[!0-9]|sr*", IMPORT{program}="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="st*", IMPORT{program}="/sbin/path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
+KERNEL=="*[!0-9]|sr*", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+KERNEL=="st*", IMPORT{program}="path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
KERNEL=="sr*|st*", GOTO="persistent_storage_end"
KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
# by-label/by-uuid (filesystem properties)
KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_storage_end"
-IMPORT{program}="/sbin/vol_id --export $tempnode"
+IMPORT{program}="vol_id --export $tempnode"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
# BIOS Enhanced Disk Device
-KERNEL=="*[!0-9]", IMPORT{program}="/sbin/edd_id --export $tempnode"
+KERNEL=="*[!0-9]", IMPORT{program}="edd_id --export $tempnode"
KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
++++++ udev-085.tar.bz2 -> udev-094.tar.bz2 ++++++
++++ 64526 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org