rpms/udev/devel udev-132-memstickrules.patch, NONE, 1.1 start_udev, 1.77, 1.78 udev.spec, 1.253, 1.254
Harald Hoyer
harald at fedoraproject.org
Mon Nov 10 10:44:41 UTC 2008
Author: harald
Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30968
Modified Files:
start_udev udev.spec
Added Files:
udev-132-memstickrules.patch
Log Message:
* Mon Nov 10 2008 Harald Hoyer <harald at redhat.com> 132-1
- version 132
- added memory stick rules (bug #470096)
udev-132-memstickrules.patch:
--- NEW FILE udev-132-memstickrules.patch ---
diff -up udev-132/rules/redhat/40-redhat.rules.memstickrules udev-132/rules/redhat/40-redhat.rules
--- udev-132/rules/redhat/40-redhat.rules.memstickrules 2008-10-16 18:03:43.000000000 +0200
+++ udev-132/rules/redhat/40-redhat.rules 2008-11-10 11:42:31.000000000 +0100
@@ -25,3 +25,7 @@ KERNEL=="vcsa[0-9]*", OWNER="vc
KERNEL=="vcc/*", OWNER="vcsa", GROUP="tty"
KERNEL=="event*", ATTRS{idVendor}=="03f0", ATTRS{interface}=="Virtual Mouse", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="input/hp_ilo_mouse"
+
+KERNEL=="mspblk[0-9]", SUBSYSTEMS=="memstick", ATTRS{name}=="?*", ATTRS{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/memstick-$env{ID_NAME}_$env{ID_SERIAL}"
+KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/memstick-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
+
Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- start_udev 8 Aug 2008 13:10:40 -0000 1.77
+++ start_udev 10 Nov 2008 10:44:11 -0000 1.78
@@ -96,10 +96,39 @@
[ -d $udev_root/shm ] || mkdir -m 0755 $udev_root/shm
[ -a /dev/MAKEDEV ] || ln -s $MAKEDEV /dev/MAKEDEV;
- [ -d /dev/.udev/makedev.d ] || mkdir -p /dev/.udev/makedev.d
USE_MD5="false"
[ -x /usr/bin/md5sum -a "$UDEV_USE_MAKEDEV_CACHE" == "yes" ] && USE_MD5="true"
+ [ -d /dev/net ] || mkdir -p /dev/net
+ /bin/mknod -m 0640 /dev/loop0 b 7 0
+ /bin/chown root:disk /dev/loop0
+ /bin/mknod -m 0640 /dev/loop1 b 7 1
+ /bin/chown root:disk /dev/loop1
+ /bin/mknod -m 0640 /dev/loop2 b 7 2
+ /bin/chown root:disk /dev/loop2
+ /bin/mknod -m 0640 /dev/loop3 b 7 3
+ /bin/chown root:disk /dev/loop3
+ /bin/mknod -m 0640 /dev/loop4 b 7 4
+ /bin/chown root:disk /dev/loop4
+ /bin/mknod -m 0640 /dev/loop5 b 7 5
+ /bin/chown root:disk /dev/loop5
+ /bin/mknod -m 0640 /dev/loop6 b 7 6
+ /bin/chown root:disk /dev/loop6
+ /bin/mknod -m 0640 /dev/loop7 b 7 7
+ /bin/chown root:disk /dev/loop7
+ /bin/mknod -m 0600 /dev/net/tun c 10 200
+ /bin/chown root:root /dev/net/tun
+ /bin/mknod -m 0600 /dev/ppp c 108 0
+ /bin/chown root:root /dev/ppp
+ /bin/mknod -m 0660 /dev/lp0 c 6 0
+ /bin/chown root:lp /dev/lp0
+ /bin/mknod -m 0660 /dev/lp1 c 6 1
+ /bin/chown root:lp /dev/lp1
+ /bin/mknod -m 0660 /dev/lp2 c 6 2
+ /bin/chown root:lp /dev/lp2
+ /bin/mknod -m 0660 /dev/lp3 c 6 3
+ /bin/chown root:lp /dev/lp3
+ /sbin/restorecon /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/net/tun /dev/ppp /dev/lp0 /dev/lp1 /dev/lp2 /dev/lp3
if [ -x "$MAKEDEV" ]; then
for i in /etc/udev/makedev.d/*.nodes; do
@@ -107,7 +136,7 @@
# use a little caching to speedup things
if [ "$USE_MD5" == "true" ]; then
# fix for MAKEDEV shell scripts
- [ -d /dev/net ] || mkdir -p /dev/net
+ [ -d /dev/.udev/makedev.d ] || mkdir -p /dev/.udev/makedev.d
md5=$(/usr/bin/md5sum "$i"|(read a b; echo $a))-se$SELINUX_STATE
if [ -f "/var/lib/udev/makedev.d/${md5}.sh" ];then
md5file="/var/lib/udev/makedev.d/${md5}.sh"
Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- udev.spec 16 Oct 2008 12:25:25 -0000 1.253
+++ udev.spec 10 Nov 2008 10:44:11 -0000 1.254
@@ -5,8 +5,8 @@
Summary: A userspace implementation of devfs
Name: udev
-Version: 127
-Release: 2%{?dist}
+Version: 132
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -14,14 +14,11 @@
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
Source1: start_udev
-Source2: udev.nodes
Source3: udev-post.init
Source4: fw_unit_symlinks.sh
Source5: udev.sysconfig
-Patch1: udev-127-volid-raid.patch
-Patch2: udev-127-volume_id-include-config.h.patch
-
+Patch1: udev-132-memstickrules.patch
Patch102: udev-118-sysconf.patch
ExclusiveOS: Linux
@@ -30,11 +27,11 @@
Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service
Requires(pre): MAKEDEV >= 0:3.11
BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
-BuildRequires: pam-devel glib2-devel bison
+BuildRequires: glib2-devel bison findutils MAKEDEV
%if %{with_static}
BuildRequires: libselinux-static libsepol-static
%endif
-Requires: libselinux >= 0:1.17.9-2 MAKEDEV sed pam
+Requires: libselinux >= 0:1.17.9-2 sed
Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
Obsoletes: dev <= 0:3.12-1
Provides: dev = 0:3.12-1
@@ -94,9 +91,9 @@
%prep
%setup -q
-%patch1 -p1 -b .p1
-%patch2 -p1 -b .p2
+%patch1 -p1 -b .memstickrules
%patch102 -p1 -b .sysconf
+rm rules/redhat/95-pam-console.rules
%build
%configure --with-selinux --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib} --sbindir="/sbin" --enable-static
@@ -184,7 +181,6 @@
mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{udev_scriptdir}/fw_unit_symlinks.sh
mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
@@ -302,7 +298,6 @@
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
%config %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
-%config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
#%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
@@ -368,6 +363,10 @@
%changelog
+* Mon Nov 10 2008 Harald Hoyer <harald at redhat.com> 132-1
+- version 132
+- added memory stick rules (bug #470096)
+
* Thu Oct 16 2008 Harald Hoyer <harald at redhat.com> 127-2
- added 2 patches for md raid vol_id
More information about the scm-commits
mailing list