[Lunar-commits] r19391 - moonbase/trunk/filesys/udev

[Moritz Heiber]

Author: moe
Date: 2006-03-22 23:04:08 +0000 (Wed, 22 Mar 2006)
New Revision: 19391

Modified:
   moonbase/trunk/filesys/udev/BUILD
   moonbase/trunk/filesys/udev/DETAILS
Log:
Update to udev 088.

* Kept the raid-devfs.sh script to retain functionality for some old
  crappy raid array setups ;p

* Updated the rules patch accordingly
* Merged the new 05-early.rules and the firmware related rules file

* Switched back to the old scheme of adding the extras as sofar has
  fixed the bug in the wrappers now that caused the EXTRAS variable
  to not get passed along.

Tested on 2.6.15.4, headers 2.6.12, gcc 3.4.4, glibc 2.3.5.

PS: Yes sofar, firmware loading works!



Modified: moonbase/trunk/filesys/udev/BUILD
===================================================================
--- moonbase/trunk/filesys/udev/BUILD	2006-03-22 22:39:32 UTC (rev 19390)
+++ moonbase/trunk/filesys/udev/BUILD	2006-03-22 23:04:08 UTC (rev 19391)
@@ -1,12 +1,16 @@
 (
+    UDEV_EXTRAS="extras/ata_id  extras/cdrom_id extras/dasd_id \
+                 extras/edd_id extras/firmware extras/floppy \
+                 extras/run_directory extras/scsi_id extras/usb_id \
+                 extras/volume_id" 
+  
+    patch_it $SOURCE2 0  &&
 
-    sedit 's:^EXTRAS =:EXTRAS = extras/ata_id extras/cdrom_id extras/dasd_id extras/edd_id extras/firmware extras/floppy extras/run_directory extras/scsi_id extras/usb_id extras/volume_id:' Makefile &&
+    make EXTRAS="${UDEV_EXTRAS}"  &&
+    prepare_install  &&
+    make EXTRAS="${UDEV_EXTRAS}" install   &&
 
-    patch_it $SOURCE2 0  &&
-    patch_it $SOURCE3 0  &&
 
-    default_make &&
-
     # Deprecated .. but udevd still doesn't do what udevstart does
     # udevsend only provided for legacy purposes
     install -m755 udevsend udevstart /sbin &&
@@ -19,13 +23,11 @@
     mkdir -p /etc/udev/rules.d /etc/udev/scripts.d  &&
 
     install -m755 ${SCRIPT_DIRECTORY}/udev /etc/init.d/  		&&
-    install -m644 ${SOURCE_CACHE}/${SOURCE4} /etc/udev/rules.d/		 		&&
+    install -m644 ${SOURCE_CACHE}/${SOURCE3} \
+		  /etc/udev/rules.d					&&
     install -m644 ${SOURCE_DIRECTORY}/etc/udev/gentoo/udev.rules \
-		  /etc/udev/rules.d/50-udev.rules  			&&
+		  /etc/udev/rules.d/50-udev.rules			&&
+    install -m755 ${SOURCE_CACHE}/${SOURCE4} \
+		  /etc/udev/scripts.d/raid-devfs.sh
 
-    for script in ide-devfs.sh raid-devfs.sh scsi-devfs.sh 
-    do
-        install -m755 extras/${script} /etc/udev/scripts.d/
-    done
-     
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/filesys/udev/DETAILS
===================================================================
--- moonbase/trunk/filesys/udev/DETAILS	2006-03-22 22:39:32 UTC (rev 19390)
+++ moonbase/trunk/filesys/udev/DETAILS	2006-03-22 23:04:08 UTC (rev 19391)
@@ -1,20 +1,20 @@
           MODULE=udev
-         VERSION=086
+         VERSION=088
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=scsi-devfs.sh.patch
-         SOURCE3=udev.rules-1.patch.bz2
-	 SOURCE4=05-firmware-085.rules
+         SOURCE2=udev.rules-2.patch.bz2
+	 SOURCE3=05-firmware-088.rules
+	 SOURCE4=raid-devfs.sh-udev-088
       SOURCE_URL=http://www.kernel.org/pub/linux/utils/kernel/hotplug/
      SOURCE2_URL=$PATCH_URL/
      SOURCE3_URL=$PATCH_URL/
      SOURCE4_URL=$PATCH_URL/
-      SOURCE_VFY=sha1:b1ab0cb88882b8db9e6783539d3fc7b3d06b2d4a
-     SOURCE2_VFY=sha1:9fc20cdd3ae95476dc066b2ff20c167f5c41c736
-     SOURCE3_VFY=sha1:34cca0d34aed61cb25618fca87a194199d992d34
-     SOURCE4_VFY=sha1:30d59242037bb8f9ebec4a367a7ba3cf2422f065
+      SOURCE_VFY=sha1:3a0fcf32aee14c36aa74172ec7d69c0d1b76b9dc
+     SOURCE2_VFY=sha1:9d3643958e89a4fd189eeb8d85ec3631087b3743
+     SOURCE3_VFY=sha1:134287008fc712920f595d4b1c59029fc3baa928
+     SOURCE4_VFY=sha1:44a12035774c2b42b784267d38e61a34aa0b645b
         WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
          ENTERED=20040104
-         UPDATED=20060228
+         UPDATED=20060322
            PSAFE=no
            SHORT="hotplug and device handling daemon"