Browse Source

Updated udev (115 -> 118) and removed hotfixes as well as adapted volumeid diff

early
Christian Wiese 17 years ago committed by Alejandro Mery
parent
commit
47a8f9f59e
  1. 41
      filesystem/udev/hotfix-install.patch
  2. 48
      filesystem/udev/hotfix-rules.patch
  3. 51
      filesystem/udev/hotfix-rules2.patch
  4. 12
      filesystem/udev/no_libvolume_id_so.diff
  5. 6
      filesystem/udev/udev.desc

41
filesystem/udev/hotfix-install.patch

@ -1,41 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../udev/hotfix-install.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
# --- SDE-COPYRIGHT-NOTE-END ---
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 11 Sep 2007 15:20:54 +0000 (+0200)
Subject: only install *.rules
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=554074c9ca2f1b8876176887e4656d06b870f2cd
only install *.rules
---
diff --git a/Makefile b/Makefile
index 39ffc7d..92ca846 100644
--- a/Makefile
+++ b/Makefile
@@ -230,9 +230,9 @@ install-config:
@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
fi
- @ for i in $(shell ls -1 etc/udev/rules.d); do \
- if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$i ]; then \
- $(INSTALL_DATA) etc/udev/rules.d/$$i $(DESTDIR)$(configdir)/rules.d; \
+ @ for i in etc/udev/rules.d/*.rules; do \
+ if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
fi \
done
@ extras="$(EXTRAS)"; for target in $$extras; do \

48
filesystem/udev/hotfix-rules.patch

@ -1,48 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../udev/hotfix-rules.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
# --- SDE-COPYRIGHT-NOTE-END ---
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 24 Aug 2007 18:34:44 +0000 (+0200)
Subject: rules: fix two trivial typos
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=d98c6dfebc2186b841c92eeb002c03938f28cdc6
rules: fix two trivial typos
Thanks to: Alexander E. Patrakov <patrakov@ums.usu.ru>
---
diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index bff2fe5..b3c0cfc 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -58,7 +58,7 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{
KERNEL=="parport[0-9]*", GROUP="lp"
SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp"
SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
-KERNEL=="lp[0-9]*", GROUP="lp" SYMLINK+="par%n"
+KERNEL=="lp[0-9]*", GROUP="lp", SYMLINK+="par%n"
KERNEL=="irlpt[0-9]*", GROUP="lp"
# block, tapes, block-releated
@@ -71,7 +71,7 @@ KERNEL=="fd[0-9]", GROUP="floppy"
KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
KERNEL=="sch[0-9]*", GROUP="disk"
KERNEL=="sg[0-9]*", GROUP="disk", MODE="0640"
-KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="disk""
+KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="disk"
KERNEL=="pg[0-9]*", GROUP="disk"
KERNEL=="pt[0-9]*|npt[0-9]*", GROUP="disk"
KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"

51
filesystem/udev/hotfix-rules2.patch

@ -1,51 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../udev/hotfix-rules2.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
# --- SDE-COPYRIGHT-NOTE-END ---
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 25 Aug 2007 12:07:02 +0000 (+0200)
Subject: rules: random and urandom are 0666
X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=b6e4b08dc14444790c1560108e93a67e57e1148b
rules: random and urandom are 0666
Thanks to: Alexander E. Patrakov <patrakov@ums.usu.ru>.
---
diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index b3c0cfc..f869f51 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -17,18 +17,16 @@ KERNEL=="hvc*|hvsi*", GROUP="uucp"
KERNEL=="lirc0", SYMLINK+="lirc"
# mem
-KERNEL=="null|zero|random", MODE="0666"
+KERNEL=="null|zero|full|random|urandom", MODE="0666"
KERNEL=="null", SYMLINK+="XOR"
KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
KERNEL=="nvram", GROUP="kmem", MODE="0600"
KERNEL=="ram0", SYMLINK+="ramdisk"
KERNEL=="ram1", SYMLINK+="ram"
-KERNEL=="urandom", MODE="0644"
-KERNEL=="full", MODE="0666"
# input
KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0640"
-KERNEL=="ts[0-9]*|uinput", NAME="input/%k", MODE="0600"
+KERNEL=="ts[0-9]*|uinput", NAME="input/%k", MODE="0600"
KERNEL=="js[0-9]*", NAME="input/%k", MODE="0644", SYMLINK+="%k"
# video4linux

12
filesystem/udev/no_libvolume_id_so.diff

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../udev/no_libvolume_id_so.diff
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,8 +14,8 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./extras/volume_id/lib/Makefile.orig 2007-06-14 13:00:06.000000000 -0400
+++ ./extras/volume_id/lib/Makefile 2007-06-14 13:01:51.000000000 -0400
--- udev-118/extras/volume_id/lib/Makefile.orig 2008-01-13 00:57:18.000000000 +0200
+++ udev-118/extras/volume_id/lib/Makefile 2008-01-13 00:59:17.000000000 +0200
@@ -59,7 +59,7 @@
libvolume_id.h \
util.h
@ -25,14 +25,18 @@
.PHONY: all
.DEFAULT: all
@@ -103,10 +103,8 @@
@@ -102,14 +102,8 @@
install: all
$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
- $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
mkdir -p $(DESTDIR)$(usrlibdir)/
- ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
-ifeq ($(libdir),$(usrlibdir))
- ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-else
- ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-endif
+ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
.PHONY: install

6
filesystem/udev/udev.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../udev/udev.desc
[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -31,8 +31,8 @@
[L] GPL
[S] Stable
[V] 115
[V] 118
[P] X -?---5---9 102.030
[D] 171889875 udev-115.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
[D] 3168492797 udev-118.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/

Loading…
Cancel
Save