From 23740f31447e7c43df8aab129396dfa569c0a57b Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Sun, 1 Feb 2009 21:47:17 +0200
Subject: [PATCH] udev: Updated (124 -> 125)

---
 filesystem/udev/modprobe_rules.patch  |  4 ++--
 filesystem/udev/overwrite_rules.patch | 26 +++++++++++---------------
 filesystem/udev/udev.conf             |  6 +++---
 filesystem/udev/udev.desc             |  4 ++--
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/filesystem/udev/modprobe_rules.patch b/filesystem/udev/modprobe_rules.patch
index 582905ed3..293798f39 100644
--- a/filesystem/udev/modprobe_rules.patch
+++ b/filesystem/udev/modprobe_rules.patch
@@ -14,8 +14,8 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- ./etc/udev/rules.d/80-drivers.rules.orig	2008-06-12 08:24:30.000000000 +0300
-+++ ./etc/udev/rules.d/80-drivers.rules	2009-02-01 17:13:46.000000000 +0200
+--- ./rules/rules.d/80-drivers.rules.orig	2008-06-12 08:24:30.000000000 +0300
++++ ./rules/rules.d/80-drivers.rules	2009-02-01 17:13:46.000000000 +0200
 @@ -10,6 +10,11 @@
  SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
  SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
diff --git a/filesystem/udev/overwrite_rules.patch b/filesystem/udev/overwrite_rules.patch
index f6caac9c7..1039bb023 100644
--- a/filesystem/udev/overwrite_rules.patch
+++ b/filesystem/udev/overwrite_rules.patch
@@ -1,11 +1,11 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
+#
 # Filename: package/.../udev/overwrite_rules.patch
-# Copyright (C) 2007 The OpenSDE Project
-# 
+# Copyright (C) 2007 - 2009 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
@@ -14,20 +14,16 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- ./Makefile.orig	2007-10-11 18:27:00.000000000 -0400
-+++ ./Makefile	2007-10-11 18:29:46.000000000 -0400
-@@ -227,13 +227,9 @@
- 
+--- ./Makefile.orig	2009-02-01 21:38:50.000000000 +0200
++++ ./Makefile	2009-02-01 21:41:24.000000000 +0200
+@@ -220,9 +220,7 @@
  install-config:
+ 	$(INSTALL) -d $(DESTDIR)$(libudevdir)/rules.d
  	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
 -	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
--		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
+-		$(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
 -	fi
-+	@ $(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir);
- 	@ 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
++	$(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir);
+ 	cp rules/rules.d/* $(DESTDIR)$(libudevdir)/rules.d
  	@ extras="$(EXTRAS)"; for target in $$extras; do \
  		$(MAKE) -C $$target $@ || exit 1; \
diff --git a/filesystem/udev/udev.conf b/filesystem/udev/udev.conf
index 035bbc3cf..104352312 100644
--- a/filesystem/udev/udev.conf
+++ b/filesystem/udev/udev.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../udev/udev.conf
-# Copyright (C) 2007 - 2008 The OpenSDE Project
+# Copyright (C) 2007 - 2009 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -29,12 +29,12 @@ udev_devices() {
 }
 
 udev_rules() {
-	local rulesd=$root$sysconfdir/udev/rules.d
+	local rulesd=$root$libdir/udev/rules.d
 
 	echo "Installing our .rules files..."
 
 	for x in $confdir/rules/*.rules; do
-		[ ! -e "etc/udev/rules.d/${x##*/}" ] || echo_warning "${x##*/}: conflict detected."
+		[ ! -e "rules/rules.d/${x##*/}" ] || echo_warning "${x##*/}: conflict detected."
 		install -v -m 644 $x $rulesd/
 	done
 }
diff --git a/filesystem/udev/udev.desc b/filesystem/udev/udev.desc
index f461eb2f0..b869d68ac 100644
--- a/filesystem/udev/udev.desc
+++ b/filesystem/udev/udev.desc
@@ -31,8 +31,8 @@
 
 [L] GPL
 [S] Stable
-[V] 124
+[V] 125
 [P] X -?---5---9 102.030
 
-[D] 939912868 udev-124.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
+[D] 2947088272 udev-125.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/