[udev/f13/master] * Mon Aug 02 2010 Harald Hoyer <harald at redhat.com> 153-1 - version 153, because device-mapper needs
Harald Hoyer
harald at fedoraproject.org
Mon Aug 2 18:14:09 UTC 2010
commit f714968249ab53fcd19215d3d5095becae409b45
Author: Harald Hoyer <harald at redhat.com>
Date: Mon Aug 2 20:14:04 2010 +0200
* Mon Aug 02 2010 Harald Hoyer <harald at redhat.com> 153-1
- version 153, because device-mapper needs IMPORT{db}
- do not remove udev database
Resolves: rhbz#610925
.gitignore | 2 +
...x-error-reporting-on-missing-firmware-fil.patch | 43 -
0002-keymap-Add-Dell-Inspiron-1011-Mini-10.patch | 26 -
0003-Fix-brightness-keys-on-MSI-Wind-U-100.patch | 37 -
...-support-for-Gateway-AOA110-AOA150-clones.patch | 29 -
0005-keymap-Fix-LG-X110.patch | 64 -
...elease-for-volume-keys-on-Dell-Studio-155.patch | 55 -
0007-keymap-Add-Toshiba-Satellite-M30X.patch | 55 -
...Add-Samsung-Q210-P210-force-release-quirk.patch | 30 -
...-Fujitsu-Amilo-1848-u-force-release-quirk.patch | 53 -
...-buffer-size-when-advancing-past-NUL-byte.patch | 29 -
...NE_SIZE-not-UTIL_PATH_SIZE-to-truncate-pr.patch | 26 -
...ncrease-UTIL_LINE_SIZE-from-2048-to-16384.patch | 37 -
...io-ports-rule-to-use-attr-instead-of-ATTR.patch | 29 -
...dev-acl-Correctly-handle-ENV-ACL_MANAGE-0.patch | 47 -
0021-input_id-Fix-linking.patch | 27 -
0022-replace-utimes-with-utimensat.patch | 34 -
...x-possible-segfault-when-firmware-device-.patch | 40 -
...nput-create-by-path-links-for-pci-devices.patch | 25 -
...t-SELinux-context-when-the-node-was-not-t.patch | 88 -
...pen-non-mounted-optical-media-with-O_EXCL.patch | 58 -
...morph-into-tool-that-only-switches-Mobile.patch | 2142 --------------------
0048-cdrom_id-remove-debugging-code.patch | 24 -
...drom_id-retry-to-open-the-device-if-EBUSY.patch | 53 -
...-cdrom_id-check-mount-state-in-retry-loop.patch | 55 -
...ways-set-ID_CDROM-regardless-if-we-can-ru.patch | 31 -
0062-cdrom_id-Fix-uninitialized-variables.patch | 131 --
0065-cdrom_id-Fix-uninitialized-buffers.patch | 82 -
0066-cdrom_id.patch | 88 -
...id-rework-feature-profiles-buffer-parsing.patch | 277 ---
0068-cdrom_id-print-more-debug-messages.patch | 121 --
...drom_id-debug-print-feature-values-in-hex.patch | 25 -
...drom_id-debug-print-feature-values-in-hex.patch | 25 -
...id-Do-not-ignore-errors-from-scsi_cmd_run.patch | 79 -
..._id-Swap-media-state-and-TOC-info-probing.patch | 38 -
...-add-missing-profiles-to-feature_profiles.patch | 36 -
...set-ID_CDROM_MEDIA-1-only-for-known-media.patch | 183 --
40-ia64.rules | 4 +
40-isdn.rules | 4 +
40-ppc.rules | 6 +
40-s390.rules | 4 +
64-device-mapper.rules | 4 +
64-md-raid.rules | 36 +
sources | 3 +-
udev.spec | 102 +-
45 files changed, 80 insertions(+), 4307 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d05c54f..6c20107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
udev-151.tar.bz2
+udev-153.tar.bz2
+udev-153.tar.bz2.sign
diff --git a/40-ia64.rules b/40-ia64.rules
new file mode 100644
index 0000000..5846f88
--- /dev/null
+++ b/40-ia64.rules
@@ -0,0 +1,4 @@
+# do not edit this file, it will be overwritten on update
+
+KERNEL=="sgi_*", MODE="0666"
+
diff --git a/40-isdn.rules b/40-isdn.rules
new file mode 100644
index 0000000..1a31cb6
--- /dev/null
+++ b/40-isdn.rules
@@ -0,0 +1,4 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout"
+SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n"
diff --git a/40-ppc.rules b/40-ppc.rules
new file mode 100644
index 0000000..90c15f0
--- /dev/null
+++ b/40-ppc.rules
@@ -0,0 +1,6 @@
+# do not edit this file, it will be overwritten on update
+
+KERNEL=="iseries/ibmsis*", GROUP="disk"
+KERNEL=="iseries/nvt*", GROUP="disk"
+KERNEL=="iseries/vt*", GROUP="disk"
+KERNEL=="iseries/vtty*, GROUP="dialout"
diff --git a/40-s390.rules b/40-s390.rules
new file mode 100644
index 0000000..43035db
--- /dev/null
+++ b/40-s390.rules
@@ -0,0 +1,4 @@
+# do not edit this file, it will be overwritten on update
+
+KERNEL=="z90crypt", MODE="0666"
+
diff --git a/64-device-mapper.rules b/64-device-mapper.rules
new file mode 100644
index 0000000..8154ef3
--- /dev/null
+++ b/64-device-mapper.rules
@@ -0,0 +1,4 @@
+# do not edit this file, it will be overwritten on update
+
+KERNEL=="device-mapper", NAME="mapper/control"
+
diff --git a/64-md-raid.rules b/64-md-raid.rules
new file mode 100644
index 0000000..6ba93b6
--- /dev/null
+++ b/64-md-raid.rules
@@ -0,0 +1,36 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM!="block", GOTO="md_end"
+ACTION!="add|change", GOTO="md_end"
+
+# import data from a raid member and activate it
+#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
+# import data from a raid set
+KERNEL!="md*", GOTO="md_end"
+
+# partitions have no md/{array_state,metadata_version}
+ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
+
+# container devices have a metadata version of e.g. 'external:ddf' and
+# never leave state 'inactive'
+ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
+TEST!="md/array_state", GOTO="md_end"
+ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
+LABEL="md_ignore_state"
+
+IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
+ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
+ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
+ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
+ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace"
+ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n"
+ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
+ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
+
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+OPTIONS+="link_priority=100"
+OPTIONS+="watch"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+LABEL="md_end"
diff --git a/sources b/sources
index 3161bc7..c94ae06 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-aeae0e6273dcbec246c3c1b9868ebed1 udev-151.tar.bz2
+76d12a9d97c3409e9ef60a4288227e8f udev-153.tar.bz2
+962e6d9b7fcf45432b361e3116923a3a udev-153.tar.bz2.sign
diff --git a/udev.spec b/udev.spec
index f809c07..112f891 100644
--- a/udev.spec
+++ b/udev.spec
@@ -4,8 +4,8 @@
Summary: A userspace implementation of devfs
Name: udev
-Version: 151
-Release: 11%{?dist}
+Version: 153
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -13,48 +13,11 @@ Obsoletes: udev-persistent < 0:030-5
Obsoletes: udev-extras < 20090618
Provides: udev-extras = 20090618-1
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-Patch1: 0001-firmware-fix-error-reporting-on-missing-firmware-fil.patch
-Patch2: 0002-keymap-Add-Dell-Inspiron-1011-Mini-10.patch
-Patch3: 0003-Fix-brightness-keys-on-MSI-Wind-U-100.patch
-Patch4: 0004-keymap-Add-support-for-Gateway-AOA110-AOA150-clones.patch
-Patch5: 0005-keymap-Fix-LG-X110.patch
-Patch6: 0006-Force-key-release-for-volume-keys-on-Dell-Studio-155.patch
-Patch7: 0007-keymap-Add-Toshiba-Satellite-M30X.patch
-Patch13: 0013-keymap-Add-Samsung-Q210-P210-force-release-quirk.patch
-Patch14: 0014-keymap-Add-Fujitsu-Amilo-1848-u-force-release-quirk.patch
-Patch15: 0015-Decrease-buffer-size-when-advancing-past-NUL-byte.patch
-Patch16: 0016-Use-UTIL_LINE_SIZE-not-UTIL_PATH_SIZE-to-truncate-pr.patch
-Patch17: 0017-Increase-UTIL_LINE_SIZE-from-2048-to-16384.patch
-Patch18: 0018-Fix-virtio-ports-rule-to-use-attr-instead-of-ATTR.patch
-Patch19: 0019-udev-acl-Correctly-handle-ENV-ACL_MANAGE-0.patch
-Patch21: 0021-input_id-Fix-linking.patch
-Patch22: 0022-replace-utimes-with-utimensat.patch
-Patch29: 0029-firmware-fix-possible-segfault-when-firmware-device-.patch
-Patch30: 0030-rules-input-create-by-path-links-for-pci-devices.patch
-Patch32: 0032-do-not-reset-SELinux-context-when-the-node-was-not-t.patch
+
Patch34: 0034-add-LGPL-COPYING-to-libudev-and-GUdev.patch
-Patch35: 0035-cdrom_id-open-non-mounted-optical-media-with-O_EXCL.patch
-Patch36: 0036-modeswitch-morph-into-tool-that-only-switches-Mobile.patch
-Patch48: 0048-cdrom_id-remove-debugging-code.patch
-Patch49: 0049-cdrom_id-retry-to-open-the-device-if-EBUSY.patch
-Patch50: 0050-cdrom_id-check-mount-state-in-retry-loop.patch
-Patch51: 0051-cdrom_id-always-set-ID_CDROM-regardless-if-we-can-ru.patch
-Patch62: 0062-cdrom_id-Fix-uninitialized-variables.patch
-Patch65: 0065-cdrom_id-Fix-uninitialized-buffers.patch
-Patch66: 0066-cdrom_id.patch
-Patch67: 0067-cdrom_id-rework-feature-profiles-buffer-parsing.patch
-Patch68: 0068-cdrom_id-print-more-debug-messages.patch
-Patch69: 0069-cdrom_id-debug-print-feature-values-in-hex.patch
-Patch70: 0070-cdrom_id-debug-print-feature-values-in-hex.patch
-Patch71: 0071-cdrom_id-Do-not-ignore-errors-from-scsi_cmd_run.patch
-Patch72: 0072-cdrom_id-Swap-media-state-and-TOC-info-probing.patch
-Patch74: 0074-cdrom_id-add-missing-profiles-to-feature_profiles.patch
-Patch75: 0075-cdrom_id-set-ID_CDROM_MEDIA-1-only-for-known-media.patch
Patch110: 0110-cdrom_id-only-mark-sr-0-9-as-ID_CDROM.patch
-
Patch101: udev-151-rules.patch
-Patch102: udev-151-virtio.patch
Patch103: udev-151-gperf.patch
Source1: start_udev
@@ -62,6 +25,13 @@ Source3: udev-post.init
Source4: fw_unit_symlinks.sh
Source5: udev.sysconfig
+Source12: 40-isdn.rules
+Source13: 64-md-raid.rules
+Source14: 64-device-mapper.rules
+Source15: 40-ia64.rules
+Source16: 40-s390.rules
+Source17: 40-ppc.rules
+
ExclusiveOS: Linux
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -152,47 +122,10 @@ glib-based applications using libudev functionality.
%prep
%setup -q
-%patch1 -p1 -b .git1
-%patch2 -p1 -b .git2
-%patch3 -p1 -b .git3
-%patch4 -p1 -b .git4
-%patch5 -p1 -b .git5
-%patch6 -p1 -b .git6
-%patch7 -p1 -b .git7
-%patch13 -p1 -b .git13
-%patch14 -p1 -b .git14
-%patch15 -p1 -b .git15
-%patch16 -p1 -b .git16
-%patch17 -p1 -b .git17
-%patch18 -p1 -b .git18
-%patch19 -p1 -b .git19
-%patch21 -p1 -b .git21
-%patch22 -p1 -b .git22
-%patch29 -p1 -b .git29
-%patch30 -p1 -b .git30
-%patch32 -p1 -b .git32
%patch34 -p1 -b .git34
-%patch35 -p1 -b .git35
-%patch36 -p1 -b .git36
-%patch48 -p1 -b .git48
-%patch49 -p1 -b .git49
-%patch50 -p1 -b .git50
-%patch51 -p1 -b .git51
-%patch62 -p1 -b .git62
-%patch65 -p1 -b .git65
-%patch66 -p1 -b .git66
-%patch67 -p1 -b .git67
-%patch68 -p1 -b .git68
-%patch69 -p1 -b .git69
-%patch70 -p1 -b .git70
-%patch71 -p1 -b .git71
-%patch72 -p1 -b .git72
-%patch74 -p1 -b .git74
-%patch75 -p1 -b .git75
%patch110 -p1 -b .git110
%patch101 -p1
-%patch102 -p1
%patch103 -p1
%build
@@ -230,17 +163,17 @@ ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id
for i in \
rules/redhat/40-redhat.rules \
%ifarch ia64
- rules/packages/40-ia64.rules \
+ %{SOURCE15} \
%endif
%ifarch ppc ppc64
- rules/packages/40-ppc.rules \
+ %{SOURCE17} \
%endif
%ifarch s390 s390x
- rules/packages/40-s390.rules \
+ %{SOURCE16} \
%endif
- rules/packages/40-isdn.rules \
- rules/packages/64-md-raid.rules \
- rules/packages/64-device-mapper.rules \
+ %{SOURCE12} \
+ %{SOURCE13} \
+ %{SOURCE14} \
; do
install -m 0644 "$i" "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}"
done
@@ -430,7 +363,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
%changelog
-* Mon Aug 02 2010 Harald Hoyer <harald at redhat.com> 151-11
+* Mon Aug 02 2010 Harald Hoyer <harald at redhat.com> 153-1
+- version 153, because device-mapper needs IMPORT{db}
- do not remove udev database
Resolves: rhbz#610925
More information about the scm-commits
mailing list