Hello community,
here is the log from the commit of package udev for openSUSE:Factory
checked in at Tue Jul 20 20:27:11 CEST 2010.
--------
--- udev/udev.changes 2010-07-05 14:00:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/udev/udev.changes 2010-07-14 00:59:25.000000000 +0200
@@ -1,0 +2,41 @@
+Wed Jul 14 00:48:53 CEST 2010 - kay.sievers@novell.com
+
+- drop systemd-units
+
+-------------------------------------------------------------------
+Wed Jul 14 00:10:12 CEST 2010 - kay.sievers@novell.com
+
+- conflict with systemd < 3
+
+-------------------------------------------------------------------
+Mon Jul 12 10:39:54 CEST 2010 - kay.sievers@novell.com
+
+- disable boot.udev_retry init script
+
+-------------------------------------------------------------------
+Mon Jul 12 00:01:59 CEST 2010 - kay.sievers@novell.com
+
+- Update to version 160
+ - fix broken persistent tape naming rules
+ - fix systemd abstract namespace handling
+
+-------------------------------------------------------------------
+Fri Jul 9 07:02:12 CEST 2010 - kay.sievers@novell.com
+
+- fix systemd service file uninstallation
+
+-------------------------------------------------------------------
+Fri Jul 9 06:29:40 CEST 2010 - kay.sievers@novell.com
+
+- build against systemd-units
+- activate systemd udev.service files
+
+-------------------------------------------------------------------
+Wed Jul 7 07:56:21 CEST 2010 - kay.sievers@novell.com
+
+- Update to version 159
+- remove all static device nodes from /lib/udev/devices/,
+ they are provided by the kernel modules themselves
+- install systemd service files
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
udev-157.tar.bz2
New:
----
udev-160.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ udev.spec ++++++
--- /var/tmp/diff_new_pack.6lzBjv/_old 2010-07-20 20:21:22.000000000 +0200
+++ /var/tmp/diff_new_pack.6lzBjv/_new 2010-07-20 20:21:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package udev (Version 157)
+# spec file for package udev (Version 160)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,8 +20,8 @@
Name: udev
Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
-Version: 157
-Release: 2
+Version: 160
+Release: 1
License: LGPLv2.1+
Group: System/Kernel
Summary: A rule-based device node and kernel event manager
@@ -30,6 +30,7 @@
Conflicts: mkinitrd < 2.5.10-12
Conflicts: util-linux < 2.16
Conflicts: ConsoleKit < 0.4.1
+Conflicts: systemd < 3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libselinux-devel libsepol-devel
BuildRequires: libusb-devel pciutils-ids usbutils
@@ -95,7 +96,7 @@
%build
# prevent man pages from re-building (xmlto)
-find . -name "*.[78]" -exec touch '{}' \;
+find . -name "*.[1-8]" -exec touch '{}' \;
export V=1
%configure \
--sysconfdir=%{_sysconfdir} \
@@ -104,6 +105,7 @@
--libexecdir=/lib/udev \
--docdir=%{_docdir}/udev \
--with-selinux \
+ --with-systemdsystemunitdir=/lib/systemd/system \
CFLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
@@ -124,11 +126,11 @@
cp %{S:10} $RPM_BUILD_ROOT/lib/udev/rules.d/
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
-# install static device nodes (nodes are in the files section below)
-mkdir -p $RPM_BUILD_ROOT/lib/udev/devices/net
+# don't run/short-cut sysv init script with different name
+ln -s udev-retry.service %{buildroot}/lib/systemd/system/udev_retry.service
%pre
-usr/sbin/groupadd -r tape 2> /dev/null || :
+/usr/sbin/groupadd -r tape 2> /dev/null || :
# kill daemon if we are not in a chroot
if test -f /proc/1/exe -a -d /proc/1/root; then
if test "$(stat -Lc '%%D-%%i' /)" = "$(stat -Lc '%%D-%%i' /proc/1/root)"; then
@@ -141,6 +143,7 @@
%post
%{fillup_and_insserv -Y boot.udev}
%{fillup_and_insserv -Y boot.udev_retry}
+/usr/bin/systemd-install --realize enable udev.service >/dev/null 2>&1 || :
# add KERNEL name match to existing persistent net rules
sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
/etc/udev/rules.d/70-persistent-net.rules >/dev/null 2>&1 || :
@@ -161,6 +164,11 @@
%postun
%insserv_cleanup
+%preun
+if [ "$1" -eq 0 ]; then
+ /usr/bin/systemd-install --realize disable udev.service >/dev/null 2>&1 || :
+fi
+
%post -n libudev0 -p /sbin/ldconfig
%postun -n libudev0 -p /sbin/ldconfig
@@ -195,9 +203,7 @@
%{_datadir}/pkgconfig/udev.pc
%doc %{_docdir}/udev
%dir /lib/udev/devices/
-%attr(666,root,root) %dev(c,10,200) /lib/udev/devices/net/tun
-%attr(660,root,root) %dev(c,108,0) /lib/udev/devices/ppp
-%attr(660,root,lp) %dev(c,6,0) /lib/udev/devices/lp0
+/lib/systemd/system/udev*.service
%files -n libudev0
%defattr(-,root,root)
++++++ udev-157.tar.bz2 -> udev-160.tar.bz2 ++++++
++++ 2289 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/ChangeLog new/udev-160/ChangeLog
--- old/udev-157/ChangeLog 2010-06-02 13:49:41.000000000 +0200
+++ new/udev-160/ChangeLog 2010-07-11 23:58:20.000000000 +0200
@@ -1,3 +1,82 @@
+Summary of changes from v159 to v160
+============================================
+
+Harald Hoyer (2):
+ 60-persistent-storage-tape: s/path_id.sh/path_id/
+ 60-persistent-storage-tape.rules: make own by-path symlink for nst tapes
+
+Kay Sievers (4):
+ version bump
+ rules: tape - remove WAIT_FOR instruction and don't export BSG_DEV
+ allow final assignment for OPTIONS:="nowatch"
+ udevd: init_notify() fix abstract namespace name handling
+
+Lennart Poettering (1):
+ systemd: make service files readable by GKeyFile
+
+Martin Pitt (2):
+ keymap: Find alternate Lenovo module
+ keymap: Add Lenovo ThinkPad SL Series extra buttons
+
+
+Summary of changes from v158 to v159
+============================================
+
+Jerone Young (1):
+ Fix stuck volume key presses for Toshiba Satellite U300 & U305models
+
+Kay Sievers (5):
+ version bump
+ add systemd service files
+ make: pre-process and install systemd service files when needed
+ make: fix 'make distcheck'
+ switch a few left-over from GPLv2 to GPLv2 or later
+
+Lennart Poettering (1):
+ systemd: update service files for newly introduced DefaultDependencies= option
+
+Martin Pitt (1):
+ keymap: Add Logitech Cordless Wave Pro
+
+Matthew Garrett (1):
+ keymap: Add support for IBM-branded USB devices
+
+Michael Meeks (1):
+ gudev: respect possibly given LD_LIBRARY_PATH
+
+Ryan Harper (2):
+ Add virtio-blk support to path_id
+ Add virtio-blk by-id rules based on 'serial' attribute
+
+
+Summary of changes from v157 to v158
+============================================
+
+Harald Hoyer (1):
+ extras/keymap: add Samsung N210 to keymap rules
+
+Kay Sievers (7):
+ version bump
+ libudev: fix fd leak in udev_enumerate_scan_devices() when tags are searched
+ udevd: in case we don't daemonize, send READY message to /sbin/init
+ delete last distro specific rules
+ remove a few comments in file headers
+ mtd_probe: add needed include, modprobe blacklist flag, and change some whitespace
+ rules: remove unused subdir
+
+Martin Pitt (4):
+ Fix hid2hci rules harder
+ add Vala vapi for gudev-1.0
+ Revert "add Vala vapi for gudev-1.0"
+ Fix usb printer rule for multiple USB interfaces
+
+Maxim Levitsky (1):
+ mtd_probe: add autodetection for xD cards
+
+Paul Bender (1):
+ configure.ac: fix cross compilation
+
+
Summary of changes from v156 to v157
============================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/Makefile.am new/udev-160/Makefile.am
--- old/udev-157/Makefile.am 2010-05-30 15:15:15.000000000 +0200
+++ new/udev-160/Makefile.am 2010-07-07 06:42:48.000000000 +0200
@@ -21,7 +21,8 @@
-Wl,--as-needed
DISTCHECK_CONFIGURE_FLAGS = \
- --enable-gtk-doc
+ --enable-gtk-doc \
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
CLEANFILES =
@@ -29,7 +30,7 @@
# libudev
# ------------------------------------------------------------------------------
LIBUDEV_CURRENT=8
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
LIBUDEV_AGE=8
SUBDIRS += libudev/docs
@@ -95,8 +96,7 @@
EXTRA_DIST += \
rules/arch \
- rules/misc \
- rules/gentoo
+ rules/misc
udevrulesdir = $(libexecdir)/rules.d
dist_udevrules_DATA = \
@@ -115,6 +115,13 @@
sharepkgconfigdir = $(datadir)/pkgconfig
sharepkgconfig_DATA = udev/udev.pc
+if WITH_SYSTEMD
+systemdsystemunit_DATA = \
+ init/udev.service \
+ init/udev-settle.service \
+ init/udev-retry.service
+endif
+
sbin_PROGRAMS = \
udev/udevd \
udev/udevadm
@@ -374,7 +381,7 @@
if ENABLE_INTROSPECTION
extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
$(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
- LD_LIBRARY_PATH=$(top_builddir)/extras/gudev \
+ LD_LIBRARY_PATH=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \
$(G_IR_SCANNER) -v \
--namespace GUdev \
--nsversion=1.0 \
@@ -467,6 +474,21 @@
libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
# ------------------------------------------------------------------------------
+# mtd_probe - autoloads FTL module for mtd devices
+# ------------------------------------------------------------------------------
+extras_mtd_probe_mtd_probe_SOURCES = \
+ extras/mtd_probe/mtd_probe.c \
+ extras/mtd_probe/mtd_probe.h \
+ extras/mtd_probe/probe_smartmedia.c
+
+extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
+
+dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
+
+libexec_PROGRAMS += extras/mtd_probe/mtd_probe
+
+
+# ------------------------------------------------------------------------------
# keymap - map custom hardware's multimedia keys
# ------------------------------------------------------------------------------
extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
@@ -512,6 +534,7 @@
extras/keymap/keymaps/hewlett-packard-presario-2100 \
extras/keymap/keymaps/hewlett-packard-tablet \
extras/keymap/keymaps/hewlett-packard-tx2 \
+ extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
extras/keymap/keymaps/lenovo-3000 \
extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
@@ -520,6 +543,7 @@
extras/keymap/keymaps/lg-x110 \
extras/keymap/keymaps/logitech-wave \
extras/keymap/keymaps/logitech-wave-cordless \
+ extras/keymap/keymaps/logitech-wave-pro-cordless \
extras/keymap/keymaps/maxdata-pro_7000 \
extras/keymap/keymaps/medion-fid2060 \
extras/keymap/keymaps/medionnb-a555 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/NEWS new/udev-160/NEWS
--- old/udev-157/NEWS 2010-05-31 10:59:44.000000000 +0200
+++ new/udev-160/NEWS 2010-07-07 07:13:11.000000000 +0200
@@ -1,3 +1,24 @@
+udev 160
+========
+Bugfixes.
+
+udev 159
+========
+Bugfixes.
+
+New and fixed keymaps.
+
+Install systemd service files if applicable.
+
+udev 158
+========
+Bugfixes.
+
+All distribution specific rules are removed from the udev source tree,
+most of them are no longer needed. The Gentoo rules which allow to support
+older kernel versions, which are not covered by the default rules anymore
+has moved to rules/misc/30-kernel-compat.rules.
+
udev 157
========
Bugfixes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/configure.ac new/udev-160/configure.ac
--- old/udev-157/configure.ac 2010-05-25 12:37:13.000000000 +0200
+++ new/udev-160/configure.ac 2010-07-07 07:13:01.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([udev], [157], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [160], [linux-hotplug@vger.kernel.org])
AC_PREREQ(2.60)
AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -49,8 +49,7 @@
AC_ARG_WITH(firmware-path,
AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
[Firmware search path (default=/lib/firmware/updates:/lib/firmware)]),
- [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"]
- )
+ [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"])
OLD_IFS=$IFS
IFS=:
for i in $with_firmware_path
@@ -64,6 +63,12 @@
IFS=$OLD_IFS
AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+
AC_ARG_ENABLE([extras],
AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
[], [enable_extras=yes])
@@ -87,17 +92,21 @@
PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
- AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
- AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
- AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
+ if test "x$cross_compiling" = "xno" ; then
+ AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
+ AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
+ AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
+ fi
AC_ARG_WITH(pci-ids-path,
- AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file]),
+ [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])],
[PCI_DATABASE=${withval}],
[if test -n "$pciids" ; then
PCI_DATABASE="$pciids"
else
AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
fi])
+ AC_MSG_CHECKING([for PCI database location])
+ AC_MSG_RESULT([$PCI_DATABASE])
AC_SUBST(PCI_DATABASE)
AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
@@ -122,10 +131,13 @@
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_FILES([
Makefile
+ udev/udev.pc
+ init/udev.service
+ init/udev-settle.service
+ init/udev-retry.service
libudev/libudev.pc
libudev/docs/Makefile
libudev/docs/version.xml
- udev/udev.pc
extras/gudev/gudev-1.0.pc
extras/gudev/docs/Makefile
extras/gudev/docs/version.xml
@@ -149,6 +161,8 @@
include_prefix: ${INCLUDE_PREFIX}
+ systemdsystemunitdir: ${systemdsystemunitdir}
+
logging: ${enable_logging}
debug: ${enable_debug}
selinux: ${with_selinux}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/ata_id/ata_id.c new/udev-160/extras/ata_id/ata_id.c
--- old/udev-157/extras/ata_id/ata_id.c 2009-12-08 18:43:09.000000000 +0100
+++ new/udev-160/extras/ata_id/ata_id.c 2010-06-21 16:56:17.000000000 +0200
@@ -1,5 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
+/*
* ata_id - reads product/serial number from ATA drives
*
* Copyright (C) 2005-2008 Kay Sievers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/edd_id/edd_id.c new/udev-160/extras/edd_id/edd_id.c
--- old/udev-157/extras/edd_id/edd_id.c 2009-12-03 13:45:03.000000000 +0100
+++ new/udev-160/extras/edd_id/edd_id.c 2010-06-25 11:39:14.000000000 +0200
@@ -4,9 +4,18 @@
* Copyright (C) 2005 John Hull
* Copyright (C) 2005 Kay Sievers
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef _GNU_SOURCE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/floppy/create_floppy_devices.c new/udev-160/extras/floppy/create_floppy_devices.c
--- old/udev-157/extras/floppy/create_floppy_devices.c 2010-05-20 08:23:40.000000000 +0200
+++ new/udev-160/extras/floppy/create_floppy_devices.c 2010-06-25 11:39:14.000000000 +0200
@@ -1,17 +1,23 @@
/*
- * create_floppy_devices
- *
* Create all possible floppy device based on the CMOS type.
* Based upon code from drivers/block/floppy.c
*
* Copyright(C) 2005, SUSE Linux Products GmbH
*
- * Author:
- * Hannes Reinecke
+ * Author: Hannes Reinecke
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/gudev/docs/html/index.html new/udev-160/extras/gudev/docs/html/index.html
--- old/udev-157/extras/gudev/docs/html/index.html 2010-06-02 13:52:31.000000000 +0200
+++ new/udev-160/extras/gudev/docs/html/index.html 2010-07-11 23:59:51.000000000 +0200
@@ -32,11 +32,11 @@
</p></div></div>
</div>
</div></div>
-<div><p class="releaseinfo">For GUdev version 157
+<div><p class="releaseinfo">For GUdev version 160
</p></div>
<div><p class="copyright">Copyright © 2009 The GUDev Authors</p></div>
<div><div class="legalnotice" title="Legal Notice">
-<a name="id297294"></a><p>
+<a name="id296741"></a><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/gudev/docs/html/ix01.html new/udev-160/extras/gudev/docs/html/ix01.html
--- old/udev-157/extras/gudev/docs/html/ix01.html 2010-06-02 13:52:31.000000000 +0200
+++ new/udev-160/extras/gudev/docs/html/ix01.html 2010-07-11 23:59:51.000000000 +0200
@@ -20,7 +20,7 @@
</tr></table>
<div class="index" title="Index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id296430"></a>Index</h2></div></div></div>
+<a name="id323276"></a>Index</h2></div></div></div>
<div class="index"><div class="indexdiv">
<h3>G</h3>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/gudev/docs/version.xml new/udev-160/extras/gudev/docs/version.xml
--- old/udev-157/extras/gudev/docs/version.xml 2010-06-02 13:50:40.000000000 +0200
+++ new/udev-160/extras/gudev/docs/version.xml 2010-07-11 23:58:54.000000000 +0200
@@ -1 +1 @@
-157
+160
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/hid2hci/70-hid2hci.rules new/udev-160/extras/hid2hci/70-hid2hci.rules
--- old/udev-157/extras/hid2hci/70-hid2hci.rules 2010-04-19 15:10:32.000000000 +0200
+++ new/udev-160/extras/hid2hci/70-hid2hci.rules 2010-06-14 13:34:09.000000000 +0200
@@ -11,7 +11,9 @@
RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
# Logitech devices (hidraw)
-KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345bce]|c71[34bc]", \
+ RUN+="hid2hci --method=logitech-hid --devpath=%p"
+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70a", \
RUN+="hid2hci --method=logitech-hid --devpath=%p"
ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/keymap/95-keyboard-force-release.rules new/udev-160/extras/keymap/95-keyboard-force-release.rules
--- old/udev-157/extras/keymap/95-keyboard-force-release.rules 2010-05-07 22:41:31.000000000 +0200
+++ new/udev-160/extras/keymap/95-keyboard-force-release.rules 2010-06-29 17:20:02.000000000 +0200
@@ -19,7 +19,7 @@
ENV{DMI_VENDOR}="$attr{[dmi/id]sys_vendor}"
-ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*N128*|*N130*|*N140*|*SR70S/SR71S*|*Q210/P210*", RUN+="keyboard-force-release.sh $devpath samsung-other"
+ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*N128*|*N130*|*N140*|*N210*|*SR70S/SR71S*|*Q210/P210*", RUN+="keyboard-force-release.sh $devpath samsung-other"
ENV{DMI_VENDOR}=="Dell Inc.", ATTR{[dmi/id]product_name}=="Studio 1557|Studio 1558", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
@@ -31,4 +31,6 @@
ENV{DMI_VENDOR}=="PEGATRON CORP.", ATTR{[dmi/id]product_name}=="Spring Peak", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
+ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite U300|Satellite Pro U300|Satellite U305", RUN+="keyboard-force-release.sh $devpath common-volume-keys"
+
LABEL="force_release_end"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/keymap/95-keymap.rules new/udev-160/extras/keymap/95-keymap.rules
--- old/udev-157/extras/keymap/95-keymap.rules 2010-06-02 13:49:13.000000000 +0200
+++ new/udev-160/extras/keymap/95-keymap.rules 2010-07-09 14:42:42.000000000 +0200
@@ -21,7 +21,11 @@
ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="Logitech USB Multimedia Keyboard", RUN+="keymap $name logitech-wave"
ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="Logitech USB Receiver", RUN+="keymap $name logitech-wave-cordless"
+# Logitech Cordless Wave Pro looks slightly weird; some hotkeys are coming through the mouse interface
+ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="c529", ATTRS{name}=="Logitech USB Receiver", RUN+="keymap $name logitech-wave-pro-cordless"
+
ENV{ID_VENDOR}=="Lite-On_Technology_Corp*", ATTRS{name}=="Lite-On Technology Corp. ThinkPad USB Keyboard with TrackPoint", RUN+="keymap $name lenovo-thinkpad-usb-keyboard-trackpoint"
+ENV{ID_VENDOR_ID}=="04b3", ENV{ID_MODEL_ID}=="301[89]", RUN+="keymap $name ibm-thinkpad-usb-keyboard-trackpoint"
GOTO="keyboard_end"
@@ -37,6 +41,7 @@
ENV{DMI_VENDOR}=="IBM*", KERNELS=="input*", ATTRS{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-ibm"
ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-lenovo"
+ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="Lenovo ThinkPad SL Series extra buttons", RUN+="keymap $name 0x0E bluetooth"
ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j"
ENV{DMI_VENDOR}=="Sony*", KERNELS=="input*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony"
@@ -110,7 +115,7 @@
ENV{DMI_VENDOR}=="MAXDATA", ATTR{[dmi/id]product_name}=="Pro 7000*", RUN+="keymap $name maxdata-pro_7000"
-ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*NC10*|*NC20*|*N128*|*N130*|*SP55S*|*SQ45S70S*|*SX60P*|*SX22S*|*SX30S*|*R59P/R60P/R61P*|*SR70S/SR71S*|*Q210*|*Q310*|*X05*|*P560*|*R560*", RUN+="keymap $name samsung-other"
+ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*NC10*|*NC20*|*N128*|*N130*|*N210*|*SP55S*|*SQ45S70S*|*SX60P*|*SX22S*|*SX30S*|*R59P/R60P/R61P*|*SR70S/SR71S*|*Q210*|*Q310*|*X05*|*P560*|*R560*", RUN+="keymap $name samsung-other"
ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="*SX20S*", RUN+="keymap $name samsung-sx20s"
ENV{DMI_VENDOR}=="[sS][aA][mM][sS][uU][nN][gG]*", ATTR{[dmi/id]product_name}=="SQ1US", RUN+="keymap $name samsung-sq1us"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/keymap/findkeyboards new/udev-160/extras/keymap/findkeyboards
--- old/udev-157/extras/keymap/findkeyboards 2009-12-15 12:49:25.000000000 +0100
+++ new/udev-160/extras/keymap/findkeyboards 2010-07-09 14:42:42.000000000 +0200
@@ -34,6 +34,8 @@
# modules
module=`udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*Extra Buttons'`
module="$module
+`udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*extra buttons'`"
+ module="$module
`udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='Sony Vaio Keys'`"
for m in $module; do
evdev=`ls -d $m/event* 2>/dev/null`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint new/udev-160/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
--- old/udev-157/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint 2010-07-04 21:04:23.000000000 +0200
@@ -0,0 +1,7 @@
+0x900f0 screenlock
+0x900f1 wlan
+0x900f2 switchvideomode
+0x900f3 suspend
+0x900f4 brightnessup
+0x900f5 brightnessdown
+0x900f8 zoom
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/keymap/keymaps/logitech-wave-pro-cordless new/udev-160/extras/keymap/keymaps/logitech-wave-pro-cordless
--- old/udev-157/extras/keymap/keymaps/logitech-wave-pro-cordless 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/extras/keymap/keymaps/logitech-wave-pro-cordless 2010-07-07 06:42:48.000000000 +0200
@@ -0,0 +1,12 @@
+0xC01B6 camera
+0xC0183 media
+0xC0184 wordprocessor
+0xC0186 spreadsheet
+0xC018E calendar
+0xC0223 homepage
+0xC01BC messenger
+0xC018A mail
+0xC0221 search
+0xC00B8 ejectcd
+0xC022D zoomin
+0xC022E zoomout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/mtd_probe/75-probe_mtd.rules new/udev-160/extras/mtd_probe/75-probe_mtd.rules
--- old/udev-157/extras/mtd_probe/75-probe_mtd.rules 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/extras/mtd_probe/75-probe_mtd.rules 2010-06-23 22:29:48.000000000 +0200
@@ -0,0 +1,8 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="mtd_probe_end"
+
+KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $tempnode"
+KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN+="/sbin/modprobe -bv sm_ftl"
+
+LABEL="mtd_probe_end"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/mtd_probe/mtd_probe.c new/udev-160/extras/mtd_probe/mtd_probe.c
--- old/udev-157/extras/mtd_probe/mtd_probe.c 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/extras/mtd_probe/mtd_probe.c 2010-06-23 22:26:36.000000000 +0200
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2010 - Maxim Levitsky
+ *
+ * mtd_probe is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mtd_probe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with mtd_probe; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+#include "mtd_probe.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+int main(int argc, char** argv)
+{
+ if (argc != 2) {
+ printf("usage: mtd_probe /dev/mtd[n]\n");
+ return 1;
+ }
+
+ int mtd_fd = open(argv[1], O_RDONLY);
+ if (mtd_fd == -1) {
+ perror("open");
+ exit(-1);
+ }
+
+ mtd_info_t mtd_info;
+ int error = ioctl(mtd_fd, MEMGETINFO, &mtd_info);
+ if (error == -1) {
+ perror("ioctl");
+ exit(-1);
+ }
+
+ probe_smart_media(mtd_fd, &mtd_info);
+ return -1;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/mtd_probe/mtd_probe.h new/udev-160/extras/mtd_probe/mtd_probe.h
--- old/udev-157/extras/mtd_probe/mtd_probe.h 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/extras/mtd_probe/mtd_probe.h 2010-06-23 22:23:13.000000000 +0200
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2010 - Maxim Levitsky
+ *
+ * mtd_probe is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mtd_probe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with mtd_probe; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#include
+
+/* Full oob structure as written on the flash */
+struct sm_oob {
+ uint32_t reserved;
+ uint8_t data_status;
+ uint8_t block_status;
+ uint8_t lba_copy1[2];
+ uint8_t ecc2[3];
+ uint8_t lba_copy2[2];
+ uint8_t ecc1[3];
+} __attribute__((packed));
+
+
+/* one sector is always 512 bytes, but it can consist of two nand pages */
+#define SM_SECTOR_SIZE 512
+
+/* oob area is also 16 bytes, but might be from two pages */
+#define SM_OOB_SIZE 16
+
+/* This is maximum zone size, and all devices that have more that one zone
+ have this size */
+#define SM_MAX_ZONE_SIZE 1024
+
+/* support for small page nand */
+#define SM_SMALL_PAGE 256
+#define SM_SMALL_OOB_SIZE 8
+
+
+void probe_smart_media(int mtd_fd, mtd_info_t *info);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/mtd_probe/probe_smartmedia.c new/udev-160/extras/mtd_probe/probe_smartmedia.c
--- old/udev-157/extras/mtd_probe/probe_smartmedia.c 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/extras/mtd_probe/probe_smartmedia.c 2010-06-23 22:26:36.000000000 +0200
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2010 - Maxim Levitsky
+ *
+ * mtd_probe is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * mtd_probe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with mtd_probe; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "mtd_probe.h"
+
+static const uint8_t cis_signature[] = {
+ 0x01, 0x03, 0xD9, 0x01, 0xFF, 0x18, 0x02, 0xDF, 0x01, 0x20
+};
+
+
+void probe_smart_media(int mtd_fd, mtd_info_t* info)
+{
+ char* cis_buffer = malloc(SM_SECTOR_SIZE);
+
+ if (!cis_buffer)
+ return;
+
+ if (info->type != MTD_NANDFLASH)
+ goto exit;
+
+ int sector_size = info->writesize;
+ int block_size = info->erasesize;
+ int size_in_megs = info->size / (1024 * 1024);
+ int spare_count;
+
+
+ if (sector_size != SM_SECTOR_SIZE && sector_size != SM_SMALL_PAGE)
+ goto exit;
+
+ switch(size_in_megs) {
+ case 1:
+ case 2:
+ spare_count = 6;
+ break;
+ case 4:
+ spare_count = 12;
+ break;
+ default:
+ spare_count = 24;
+ break;
+ }
+
+
+ int offset;
+ int cis_found = 0;
+
+ for (offset = 0 ; offset < block_size * spare_count ;
+ offset += sector_size) {
+
+ lseek(mtd_fd, SEEK_SET, offset);
+ if (read(mtd_fd, cis_buffer, SM_SECTOR_SIZE) == SM_SECTOR_SIZE){
+ cis_found = 1;
+ break;
+ }
+ }
+
+ if (!cis_found)
+ goto exit;
+
+ if (memcmp(cis_buffer, cis_signature, sizeof(cis_signature)) != 0 &&
+ (memcmp(cis_buffer + SM_SMALL_PAGE, cis_signature,
+ sizeof(cis_signature)) != 0))
+ goto exit;
+
+ printf("MTD_FTL=smartmedia\n");
+ free(cis_buffer);
+ exit(0);
+exit:
+ free(cis_buffer);
+ return;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/path_id/path_id.c new/udev-160/extras/path_id/path_id.c
--- old/udev-157/extras/path_id/path_id.c 2009-12-03 13:45:03.000000000 +0100
+++ new/udev-160/extras/path_id/path_id.c 2010-06-29 17:22:48.000000000 +0200
@@ -448,6 +448,9 @@
} else if (strcmp(subsys, "xen") == 0) {
path_prepend(&path, "xen-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "xen");
+ } else if (strcmp(subsys, "virtio") == 0) {
+ path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent));
+ parent = skip_subsystem(parent, "virtio");
}
parent = udev_device_get_parent(parent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/rule_generator/rule_generator.functions new/udev-160/extras/rule_generator/rule_generator.functions
--- old/udev-157/extras/rule_generator/rule_generator.functions 2009-12-03 13:45:03.000000000 +0100
+++ new/udev-160/extras/rule_generator/rule_generator.functions 2010-06-25 11:36:10.000000000 +0200
@@ -1,8 +1,22 @@
# functions used by the udev rule generator
+
+# Copyright (C) 2006 Marco d'Itri
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+PATH='/sbin:/bin'
#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation version 2 of the License.
PATH='/sbin:/bin'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/rule_generator/write_cd_rules new/udev-160/extras/rule_generator/write_cd_rules
--- old/udev-157/extras/rule_generator/write_cd_rules 2009-12-03 13:45:03.000000000 +0100
+++ new/udev-160/extras/rule_generator/write_cd_rules 2010-06-25 11:37:36.000000000 +0200
@@ -4,12 +4,21 @@
#
# It adds symlinks for optical drives based on the device class determined
# by cdrom_id and used ID_PATH to identify the device.
-#
+
# (C) 2006 Marco d'Itri
#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation version 2 of the License.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
# debug, if UDEV_LOG=<debug>
if [ -n "$UDEV_LOG" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/rule_generator/write_net_rules new/udev-160/extras/rule_generator/write_net_rules
--- old/udev-157/extras/rule_generator/write_net_rules 2009-12-03 13:45:03.000000000 +0100
+++ new/udev-160/extras/rule_generator/write_net_rules 2010-06-25 11:38:00.000000000 +0200
@@ -1,12 +1,5 @@
#!/bin/sh -e
-#
-# Copyright (C) 2006 Marco d'Itri
-# Copyright (C) 2007 Kay Sievers
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation version 2 of the License.
-#
+
# This script is run to create persistent network device naming rules
# based on properties of the device.
# If the interface needs to be renamed, INTERFACE_NEW=<name> will be printed
@@ -22,6 +15,22 @@
# INTERFACE_NAME requested name supplied by external tool
# INTERFACE_NEW new interface name returned by rule writer
+# Copyright (C) 2006 Marco d'Itri
+# Copyright (C) 2007 Kay Sievers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
# debug, if UDEV_LOG=<debug>
if [ -n "$UDEV_LOG" ]; then
if [ "$UDEV_LOG" -ge 7 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/scsi_id/scsi_id.c new/udev-160/extras/scsi_id/scsi_id.c
--- old/udev-157/extras/scsi_id/scsi_id.c 2009-12-08 18:43:09.000000000 +0100
+++ new/udev-160/extras/scsi_id/scsi_id.c 2010-06-25 11:39:14.000000000 +0200
@@ -1,18 +1,19 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * scsi_id.c
- *
- * Main section of the scsi_id program
- *
+/*
* Copyright (C) IBM Corp. 2003
* Copyright (C) SUSE Linux Products GmbH, 2006
*
- * Author:
- * Patrick Mansfield
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/scsi_id/scsi_id.h new/udev-160/extras/scsi_id/scsi_id.h
--- old/udev-157/extras/scsi_id/scsi_id.h 2009-12-08 18:43:09.000000000 +0100
+++ new/udev-160/extras/scsi_id/scsi_id.h 2010-06-25 11:30:08.000000000 +0200
@@ -1,14 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * scsi_id.h
+/*
+ * Copyright (C) IBM Corp. 2003
*
- * General defines and such for scsi_id
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
*
- * Copyright (C) IBM Corp. 2003
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#define MAX_PATH_LEN 512
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/scsi_id/scsi_serial.c new/udev-160/extras/scsi_id/scsi_serial.c
--- old/udev-157/extras/scsi_id/scsi_serial.c 2010-04-07 09:20:44.000000000 +0200
+++ new/udev-160/extras/scsi_id/scsi_serial.c 2010-06-25 11:39:14.000000000 +0200
@@ -1,17 +1,20 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * scsi_serial.c
+/*
+ * Copyright (C) IBM Corp. 2003
*
- * Code related to requesting and getting an id from a scsi device
+ * Author: Patrick Mansfield
*
- * Copyright (C) IBM Corp. 2003
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
*
- * Author:
- * Patrick Mansfield
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/extras/usb_id/usb_id.c new/udev-160/extras/usb_id/usb_id.c
--- old/udev-157/extras/usb_id/usb_id.c 2010-03-17 16:35:36.000000000 +0100
+++ new/udev-160/extras/usb_id/usb_id.c 2010-06-25 11:39:14.000000000 +0200
@@ -3,12 +3,20 @@
*
* Copyright (c) 2005 SUSE Linux Products GmbH, Germany
*
- * Author:
- * Hannes Reinecke
+ * Author: Hannes Reinecke
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/init/udev-retry.service.in new/udev-160/init/udev-retry.service.in
--- old/udev-157/init/udev-retry.service.in 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/init/udev-retry.service.in 2010-07-09 14:42:42.000000000 +0200
@@ -0,0 +1,13 @@
+[Unit]
+Description=re-trigger failed events after filesystems are available
+DefaultDependencies=no
+After=local-fs.target udev.service
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=@sbindir@/udevadm trigger --type=failed
+
+[Install]
+WantedBy=sysinit.target
+Also=udev.service udev-settle.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/init/udev-settle.service.in new/udev-160/init/udev-settle.service.in
--- old/udev-157/init/udev-settle.service.in 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/init/udev-settle.service.in 2010-07-09 14:42:42.000000000 +0200
@@ -0,0 +1,13 @@
+[Unit]
+Description=wait until full initialization
+DefaultDependencies=no
+After=udev.service
+
+[Service]
+Type=finish
+ValidNoProcess=yes
+ExecStart=@sbindir@/udevadm settle
+
+[Install]
+WantedBy=sysinit.target
+Also=udev.service udev-retry.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/init/udev.service.in new/udev-160/init/udev.service.in
--- old/udev-157/init/udev.service.in 1970-01-01 01:00:00.000000000 +0100
+++ new/udev-160/init/udev.service.in 2010-07-09 14:42:42.000000000 +0200
@@ -0,0 +1,13 @@
+[Unit]
+Description=/dev and kernel device manager
+DefaultDependencies=no
+Before=sysinit.target
+
+[Service]
+Type=notify
+ExecStart=@sbindir@/udevd
+ExecStartPost=@sbindir@/udevadm trigger --type=subsystems --action=add ; @sbindir@/udevadm trigger --type=devices --action=add
+
+[Install]
+WantedBy=sysinit.target
+Also=udev-settle.service udev-retry.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/libudev/docs/html/ch01.html new/udev-160/libudev/docs/html/ch01.html
--- old/udev-157/libudev/docs/html/ch01.html 2010-06-02 13:52:30.000000000 +0200
+++ new/udev-160/libudev/docs/html/ch01.html 2010-07-11 23:59:50.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter" title="libudev">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id334471"></a>libudev</h2></div></div></div>
+<a name="id313223"></a>libudev</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libudev-udev.html">udev</a></span><span class="refpurpose"> — libudev context</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/libudev/docs/html/index.html new/udev-160/libudev/docs/html/index.html
--- old/udev-157/libudev/docs/html/index.html 2010-06-02 13:52:30.000000000 +0200
+++ new/udev-160/libudev/docs/html/index.html 2010-07-11 23:59:50.000000000 +0200
@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libudev Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for libudev version 157
+<div><p class="releaseinfo">for libudev version 160
</p></div>
<div><p class="copyright">Copyright © 2009-2010 Kay Sievers <kay.sievers@vrfy.org></p></div>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/libudev/docs/version.xml new/udev-160/libudev/docs/version.xml
--- old/udev-157/libudev/docs/version.xml 2010-06-02 13:50:40.000000000 +0200
+++ new/udev-160/libudev/docs/version.xml 2010-07-11 23:58:54.000000000 +0200
@@ -1 +1 @@
-157
+160
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/libudev/libudev-enumerate.c new/udev-160/libudev/libudev-enumerate.c
--- old/udev-157/libudev/libudev-enumerate.c 2010-04-22 17:52:41.000000000 +0200
+++ new/udev-160/libudev/libudev-enumerate.c 2010-06-05 10:19:25.000000000 +0200
@@ -735,6 +735,7 @@
syspath_add(udev_enumerate, udev_device_get_syspath(dev));
udev_device_unref(dev);
}
+ closedir(dir);
}
} else {
util_strscpyl(base, sizeof(base), udev_get_sys_path(udev), "/subsystem", NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/rules/gentoo/30-kernel-compat.rules new/udev-160/rules/gentoo/30-kernel-compat.rules
--- old/udev-157/rules/gentoo/30-kernel-compat.rules 2009-12-03 13:45:03.000000000 +0100
+++ new/udev-160/rules/gentoo/30-kernel-compat.rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION!="add|change", GOTO="kernel_compat_end"
-
-#
-# sysfs timing rules
-#
-
-# needed for kernels <2.6.30
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", WAIT_FOR_SYSFS="descriptors"
-
-#
-# naming device rules
-#
-
-# dvb device naming
-# needed for kernels <2.6.29-rc1
-SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
-
-# naming rules for kernels <2.6.31
-
-# alsa names
-KERNEL=="controlC[0-9]*", NAME="snd/%k"
-KERNEL=="hwC[D0-9]*", NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k"
-KERNEL=="midiC[D0-9]*", NAME="snd/%k"
-KERNEL=="timer", NAME="snd/%k"
-KERNEL=="seq", NAME="snd/%k"
-
-KERNEL=="mwave", NAME="modems/mwave"
-
-KERNEL=="mouse*|mice|event*", NAME="input/%k"
-KERNEL=="ts[0-9]*|uinput", NAME="input/%k"
-KERNEL=="js[0-9]*", NAME="input/%k"
-
-KERNEL=="card[0-9]*", NAME="dri/%k"
-
-SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}"
-
-# libusb device nodes
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}"
-
-# printer
-SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k"
-
-# block
-KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k"
-KERNEL=="pktcdvd", NAME="pktcdvd/control"
-
-KERNEL=="rawctl", NAME="raw/rawctl"
-SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k"
-SUBSYSTEM=="bsg", NAME="bsg/%k"
-SUBSYSTEM=="aoe", NAME="etherd/%k"
-
-# network
-KERNEL=="tun", NAME="net/%k"
-
-# CPU
-KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid"
-KERNEL=="msr[0-9]*", NAME="cpu/%n/msr"
-KERNEL=="microcode", NAME="cpu/microcode", MODE="0600"
-
-# miscellaneous
-KERNEL=="auer[0-9]*", NAME="usb/%k"
-KERNEL=="hw_random", NAME="hwrng"
-KERNEL=="sxctl", NAME="specialix_sxctl"
-KERNEL=="rioctl", NAME="specialix_rioctl"
-KERNEL=="iowarrior[0-9]*", NAME="usb/%k"
-KERNEL=="hiddev[0-9]*", NAME="usb/%k"
-KERNEL=="legousbtower[0-9]*", NAME="usb/%k"
-KERNEL=="dabusb[0-9]*", NAME="usb/%k"
-KERNEL=="usbdpfp[0-9]*", NAME="usb/%k"
-KERNEL=="cpad[0-9]*", NAME="usb/%k"
-
-# end of naming rules for kernel <2.6.31
-
-
-#
-# module loading rules
-#
-ACTION!="add", GOTO="kernel_compat_end"
-
-# No need for more code, as MODALIAS is present
-ENV{MODALIAS}=="?*", GOTO="kernel_compat_end"
-
-# needed for kernel <2.6.30-rc1
-SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/sbin/modprobe -b ch"
-SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -b mmc_block"
-
-# needed for kernel <2.6.27-rc5
-# acpi will do on newer kernels
-SUBSYSTEM=="pnp", DRIVER!="?*", \
- RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
-
-LABEL="kernel_compat_end"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/rules/gentoo/40-gentoo.rules new/udev-160/rules/gentoo/40-gentoo.rules
--- old/udev-157/rules/gentoo/40-gentoo.rules 2010-05-03 13:19:02.000000000 +0200
+++ new/udev-160/rules/gentoo/40-gentoo.rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# keep devices after driver unload
-KERNEL=="ppp", OPTIONS+="ignore_remove"
-KERNEL=="tun", OPTIONS+="ignore_remove"
-
-
-# setting permissions
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-
-# dialout devices
-KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="dialout"
-
-# sound devices (oss)
-SUBSYSTEM=="snd", GROUP="audio"
-
-# Sony Vaio Jogdial sonypi device
-KERNEL=="sonypi", MODE="0666"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/rules/gentoo/90-network.rules new/udev-160/rules/gentoo/90-network.rules
--- old/udev-157/rules/gentoo/90-network.rules 2009-12-03 13:45:03.000000000 +0100
+++ new/udev-160/rules/gentoo/90-network.rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# /etc/udev/rules/90-network.rules: triggering network init-scripts
-
-# Activate our network if we can
-SUBSYSTEM=="net", ACTION=="add", RUN+="net.sh %k start"
-SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/rules/rules.d/50-udev-default.rules new/udev-160/rules/rules.d/50-udev-default.rules
--- old/udev-157/rules/rules.d/50-udev-default.rules 2010-05-25 14:43:05.000000000 +0200
+++ new/udev-160/rules/rules.d/50-udev-default.rules 2010-06-17 21:52:15.000000000 +0200
@@ -68,7 +68,7 @@
# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
# the ones from the old usblp kernel module
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="0664"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701*:", GROUP="lp", MODE="0664"
# block
SUBSYSTEM=="block", GROUP="disk"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/rules/rules.d/60-persistent-storage-tape.rules new/udev-160/rules/rules.d/60-persistent-storage-tape.rules
--- old/udev-157/rules/rules.d/60-persistent-storage-tape.rules 2010-04-12 16:40:43.000000000 +0200
+++ new/udev-160/rules/rules.d/60-persistent-storage-tape.rules 2010-07-09 14:42:42.000000000 +0200
@@ -11,14 +11,14 @@
KERNEL=="st*[0-9]|nst*[0-9]", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
KERNEL=="st*[0-9]|nst*[0-9]", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
-KERNEL=="st*[0-9]|nst*[0-9]", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", KERNELS=="[0-9]*:*[0-9]", ENV{BSG_DEV}="$root/bsg/$id"
-KERNEL=="st*[0-9]|nst*[0-9]", ENV{ID_SERIAL}!="?*", WAIT_FOR="$env{BSG_DEV}", IMPORT="scsi_id --whitelisted --export --device=$env{BSG_DEV}", ENV{ID_BUS}="scsi"
+KERNEL=="st*[0-9]|nst*[0-9]", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", KERNELS=="[0-9]*:*[0-9]", ENV{.BSG_DEV}="$root/bsg/$id"
+KERNEL=="st*[0-9]|nst*[0-9]", ENV{ID_SERIAL}!="?*", IMPORT="scsi_id --whitelisted --export --device=$env{.BSG_DEV}", ENV{ID_BUS}="scsi"
KERNEL=="st*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
KERNEL=="nst*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
# by-path (parent device path)
-KERNEL=="st*[0-9]|nst*[0-9]", IMPORT{program}="path_id.sh %p"
+KERNEL=="st*[0-9]|nst*[0-9]", IMPORT{program}="path_id %p"
KERNEL=="st*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
-KERNEL=="nst*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
+KERNEL=="nst*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}-nst"
LABEL="persistent_storage_tape_end"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/rules/rules.d/60-persistent-storage.rules new/udev-160/rules/rules.d/60-persistent-storage.rules
--- old/udev-157/rules/rules.d/60-persistent-storage.rules 2010-05-25 09:48:55.000000000 +0200
+++ new/udev-160/rules/rules.d/60-persistent-storage.rules 2010-06-29 17:22:58.000000000 +0200
@@ -18,6 +18,10 @@
# for partitions import parent information
ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*"
+# virtio-blk
+KERNEL=="vd*[!0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}"
+KERNEL=="vd*[0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}-part%n"
+
# USB devices use their own serial number
KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
# ATA devices with their own "ata" kernel subsystem
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/udev/udev-rules.c new/udev-160/udev/udev-rules.c
--- old/udev-157/udev/udev-rules.c 2010-05-31 10:10:59.000000000 +0200
+++ new/udev-160/udev/udev-rules.c 2010-07-07 11:33:27.000000000 +0200
@@ -1569,42 +1569,42 @@
if (pos != NULL) {
int prio = atoi(&pos[strlen("link_priority=")]);
- rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, 0, NULL, &prio);
+ rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, op, NULL, &prio);
dbg(rules->udev, "link priority=%i\n", prio);
}
pos = strstr(value, "event_timeout=");
if (pos != NULL) {
int tout = atoi(&pos[strlen("event_timeout=")]);
- rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
+ rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, op, NULL, &tout);
dbg(rules->udev, "event timeout=%i\n", tout);
}
pos = strstr(value, "string_escape=");
if (pos != NULL) {
pos = &pos[strlen("string_escape=")];
if (strncmp(pos, "none", strlen("none")) == 0)
- rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, op, NULL, NULL);
else if (strncmp(pos, "replace", strlen("replace")) == 0)
- rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL);
+ rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, op, NULL, NULL);
}
pos = strstr(value, "nowatch");
if (pos != NULL) {
const int off = 0;
- rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, NULL, &off);
+ rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &off);
dbg(rules->udev, "inotify watch of device disabled\n");
} else {
pos = strstr(value, "watch");
if (pos != NULL) {
const int on = 1;
- rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, NULL, &on);
+ rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &on);
dbg(rules->udev, "inotify watch of device requested\n");
}
}
pos = strstr(value, "static_node=");
if (pos != NULL) {
- rule_add_key(&rule_tmp, TK_A_STATIC_NODE, 0, &pos[strlen("static_node=")], NULL);
+ rule_add_key(&rule_tmp, TK_A_STATIC_NODE, op, &pos[strlen("static_node=")], NULL);
rule_tmp.rule.rule.has_static_node = true;
}
continue;
@@ -2400,6 +2400,10 @@
esc = ESCAPE_REPLACE;
break;
case TK_A_INOTIFY_WATCH:
+ if (event->inotify_watch_final)
+ break;
+ if (cur->key.op == OP_ASSIGN_FINAL)
+ event->inotify_watch_final = true;
event->inotify_watch = cur->key.watch;
break;
case TK_A_DEVLINK_PRIO:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/udev/udev.7 new/udev-160/udev/udev.7
--- old/udev-157/udev/udev.7 2010-06-02 13:51:33.000000000 +0200
+++ new/udev-160/udev/udev.7 2010-07-11 23:59:04.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: udev
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/
-.\" Date: 06/02/2010
+.\" Date: 07/11/2010
.\" Manual: udev
.\" Source: udev
.\" Language: English
.\"
-.TH "UDEV" "7" "06/02/2010" "udev" "udev"
+.TH "UDEV" "7" "07/11/2010" "udev" "udev"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -332,6 +332,11 @@
.RS 4
Watch the device node with inotify, when closed after being opened for writing, a change uevent will be synthesised\&.
.RE
+.PP
+\fBnowatch\fR
+.RS 4
+Disable the watching of a device node with inotify\&.
+.RE
.RE
.PP
The
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/udev/udev.h new/udev-160/udev/udev.h
--- old/udev-157/udev/udev.h 2010-05-28 12:01:00.000000000 +0200
+++ new/udev-160/udev/udev.h 2010-07-07 11:26:55.000000000 +0200
@@ -44,13 +44,14 @@
gid_t gid;
struct udev_list_node run_list;
int exec_delay;
+ bool inotify_watch;
+ bool inotify_watch_final;
bool group_final;
bool owner_final;
bool mode_final;
bool name_final;
bool devlink_final;
bool run_final;
- bool inotify_watch;
};
struct udev_watch {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/udev/udev.xml new/udev-160/udev/udev.xml
--- old/udev-157/udev/udev.xml 2010-05-31 01:12:37.000000000 +0200
+++ new/udev-160/udev/udev.xml 2010-07-07 11:35:10.000000000 +0200
@@ -513,6 +513,12 @@
writing, a change uevent will be synthesised.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>nowatch</option></term>
+ <listitem>
+ <para>Disable the watching of a device node with inotify.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</listitem>
</varlistentry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/udev/udevadm.8 new/udev-160/udev/udevadm.8
--- old/udev-157/udev/udevadm.8 2010-06-02 13:51:33.000000000 +0200
+++ new/udev-160/udev/udevadm.8 2010-07-11 23:59:04.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: udevadm
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/
-.\" Date: 06/02/2010
+.\" Date: 07/11/2010
.\" Manual: udevadm
.\" Source: udev
.\" Language: English
.\"
-.TH "UDEVADM" "8" "06/02/2010" "udev" "udevadm"
+.TH "UDEVADM" "8" "07/11/2010" "udev" "udevadm"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/udev/udevd.8 new/udev-160/udev/udevd.8
--- old/udev-157/udev/udevd.8 2010-06-02 13:51:32.000000000 +0200
+++ new/udev-160/udev/udevd.8 2010-07-11 23:59:03.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: udevd
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/
-.\" Date: 06/02/2010
+.\" Date: 07/11/2010
.\" Manual: udevd
.\" Source: udev
.\" Language: English
.\"
-.TH "UDEVD" "8" "06/02/2010" "udev" "udevd"
+.TH "UDEVD" "8" "07/11/2010" "udev" "udevd"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/udev-157/udev/udevd.c new/udev-160/udev/udevd.c
--- old/udev-157/udev/udevd.c 2010-05-30 23:42:47.000000000 +0200
+++ new/udev-160/udev/udevd.c 2010-07-11 23:54:10.000000000 +0200
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -950,6 +951,83 @@
return memsize;
}
+static int init_notify(const char *state)
+{
+ int fd = -1, r;
+ struct msghdr msghdr;
+ struct iovec iovec;
+ struct ucred *ucred;
+ union {
+ struct sockaddr sa;
+ struct sockaddr_un un;
+ } sockaddr;
+ union {
+ struct cmsghdr cmsghdr;
+ uint8_t buf[CMSG_SPACE(sizeof(struct ucred))];
+ } control;
+ const char *e;
+
+ if (!(e = getenv("NOTIFY_SOCKET"))) {
+ r = 0;
+ goto finish;
+ }
+
+ /* Must be an abstract socket, or an absolute path */
+ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {
+ r = -EINVAL;
+ goto finish;
+ }
+
+ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ memset(&sockaddr, 0, sizeof(sockaddr));
+ sockaddr.sa.sa_family = AF_UNIX;
+ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));
+
+ if (sockaddr.un.sun_path[0] == '@')
+ sockaddr.un.sun_path[0] = 0;
+
+ memset(&iovec, 0, sizeof(iovec));
+ iovec.iov_base = (char*) state;
+ iovec.iov_len = strlen(state);
+
+ memset(&control, 0, sizeof(control));
+ control.cmsghdr.cmsg_level = SOL_SOCKET;
+ control.cmsghdr.cmsg_type = SCM_CREDENTIALS;
+ control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred));
+
+ ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr);
+ ucred->pid = getpid();
+ ucred->uid = getuid();
+ ucred->gid = getgid();
+
+ memset(&msghdr, 0, sizeof(msghdr));
+ msghdr.msg_name = &sockaddr;
+ msghdr.msg_namelen = sizeof(sa_family_t) + strlen(e);
+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
+ msghdr.msg_namelen = sizeof(struct sockaddr_un);
+ msghdr.msg_iov = &iovec;
+ msghdr.msg_iovlen = 1;
+ msghdr.msg_control = &control;
+ msghdr.msg_controllen = control.cmsghdr.cmsg_len;
+
+ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
+ r = -errno;
+ goto finish;
+ }
+
+ r = 0;
+
+finish:
+ if (fd >= 0)
+ close(fd);
+
+ return r;
+}
+
int main(int argc, char *argv[])
{
struct udev *udev;
@@ -1201,6 +1279,8 @@
rc = 0;
goto exit;
}
+ } else {
+ init_notify("READY=1");
}
/* set scheduling priority for the main daemon process */
++++++ udev-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.6lzBjv/_old 2010-07-20 20:21:22.000000000 +0200
+++ /var/tmp/diff_new_pack.6lzBjv/_new 2010-07-20 20:21:22.000000000 +0200
@@ -3,3 +3,4 @@
addFilter(".*dangling-symlink /lib/udev/devices/fd.*")
addFilter(".init-script-without-%stop_on_removal-preun*.*")
addFilter(".*devel-file-in-non-devel-package.*udev.pc.*")
+addFilter(".*libgudev-.*shlib-fixed-dependency.*")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org