[Lunar-commits] r26783 - in moonbase/branches/crater/modules_fixed_for_glibc_2.7: . udev

[Moritz Heiber]

Author: moe
Date: 2007-11-17 21:21:19 +0100 (Sat, 17 Nov 2007)
New Revision: 26783

Added:
   moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/
Modified:
   moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/BUILD
   moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/DETAILS
   moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/POST_INSTALL
   moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/udev
Log:
Adding the new udev in here .. this is it people. If udev is going green
we're ready for liftoff for all parts of the new glibc upgrade.



Copied: moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev (from rev 26644, moonbase/trunk/filesys/udev)

Modified: moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/BUILD
===================================================================
--- moonbase/trunk/filesys/udev/BUILD	2007-11-06 18:12:11 UTC (rev 26644)
+++ moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/BUILD	2007-11-17 20:21:19 UTC (rev 26783)
@@ -5,17 +5,16 @@
     add_priv_group usb
     add_priv_group cdrw
 
-    UDEV_EXTRAS="extras/ata_id  extras/cdrom_id extras/dasd_id \
-                 extras/edd_id extras/firmware extras/floppy \
-                 extras/rule_generator extras/run_directory \
-                 extras/scsi_id extras/usb_id extras/path_id \
-                 extras/volume_id"
+    UDEV_EXTRAS="extras/ata_id  extras/collect extras/firmware \
+                 extras/path_id extras/scsi_id extras/volume_id \
+                 extras/cdrom_id extras/edd_id extras/floppy \
+                 extras/rule_generator extras/usb_id"
 
-    patch_it $SOURCE2 0  &&
+    patch_it $SOURCE2 0 &&
 
-    make EXTRAS="${UDEV_EXTRAS}"  &&
-    prepare_install  &&
-    make EXTRAS="${UDEV_EXTRAS}" install   &&
+    make EXTRAS="${UDEV_EXTRAS}" &&
+    prepare_install &&
+    make EXTRAS="${UDEV_EXTRAS}" install &&
 
 
     # Deprecated .. but udevd still doesn't do what udevstart does
@@ -26,17 +25,19 @@
     # we cannot use automagic install via coretools
     # since the udev script would be linked from rcX.d
     # and would interfere with boot/{reboot,halt}
-    mkdir -p /etc/udev/rules.d /etc/udev/scripts.d  &&
+    mkdir -p /etc/udev/rules.d /etc/udev/scripts.d &&
 
-    install -m755 ${SCRIPT_DIRECTORY}/udev /etc/init.d/                 &&
+    install -m755 ${SCRIPT_DIRECTORY}/udev /etc/init.d/ &&
 
-    for script in ${SOURCE_DIRECTORY}/etc/udev/rules.d/*; do
-      install -m644 ${script} /etc/udev/rules.d/
-    done &&
+    # We provide our own default set of rules
+    rm -f /etc/udev/rules.d/50-udev-default.rules &&
 
-    install -m644 ${SOURCE_DIRECTORY}/etc/udev/gentoo/udev.rules \
-                  /etc/udev/rules.d/50-udev.rules                       &&
+    install -m644 ${SOURCE_DIRECTORY}/etc/udev/gentoo/50-udev.rules \
+                  /etc/udev/rules.d/50-udev.rules &&
     install -m755 ${SOURCE_CACHE}/${SOURCE3} \
-                  /etc/udev/scripts.d/raid-devfs.sh
+                  /etc/udev/scripts.d/raid-devfs.sh &&
 
+    # We need to remove those in order to get a clean start
+    rm -f /etc/udev/rules.d/70-persistent-{cd,net}.rules
+
 ) > $C_FIFO 2>&1

Modified: moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/DETAILS
===================================================================
--- moonbase/trunk/filesys/udev/DETAILS	2007-11-06 18:12:11 UTC (rev 26644)
+++ moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/DETAILS	2007-11-17 20:21:19 UTC (rev 26783)
@@ -1,13 +1,13 @@
           MODULE=udev
-         VERSION=105
+         VERSION=115
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=udev.rules-v7.patch
+         SOURCE2=udev.rules-v9.patch
          SOURCE3=raid-devfs.sh-udev-088
       SOURCE_URL=http://www.kernel.org/pub/linux/utils/kernel/hotplug/
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:c889d1d73a87813fd98a9f784486b0e0e3a228b8
-     SOURCE2_VFY=sha1:e632c6e85e7382ee74fe92210a67ecd614580bda
+      SOURCE_VFY=sha1:392f5a8d35a231b0edf075827f194ccfd946234f
+     SOURCE2_VFY=sha1:b089dc4c68c506208f3093b5726ce7f63aa2bada
      SOURCE3_VFY=sha1:44a12035774c2b42b784267d38e61a34aa0b645b
         WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
          ENTERED=20040104

Modified: moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/POST_INSTALL
===================================================================
--- moonbase/trunk/filesys/udev/POST_INSTALL	2007-11-06 18:12:11 UTC (rev 26644)
+++ moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/POST_INSTALL	2007-11-17 20:21:19 UTC (rev 26783)
@@ -54,17 +54,4 @@
 create_node 0600 ram1    b 1 1      &&
 
 echo -n "Unmounting fake root... "   && umount ${FAKEROOT} && echo "done." && 
-echo -n "Removing fake root dir... " && rm -rf ${FAKEROOT} && echo "done." &&
-
-echo -en "\nMaking sure mount script has udev support... "
-
-if grep -q "udev" /etc/init.d/mount ; then
-   echo "yes."
-else
-   echo "no."
-   echo -e "Reinstalling e2fsprogs to get an updated initscript with udev support:"
-   echo -en "\t* Renaming mount initscript to mount.old... " && 
-   mv /etc/init.d/mount /etc/init.d/mount.old && echo "done."
-   echo -e "\t* re-lin'ing e2fsprogs...\n"
-   lin -c e2fsprogs
-fi
+echo -n "Removing fake root dir... " && rm -rf ${FAKEROOT} && echo "done."


Property changes on: moonbase/branches/crater/modules_fixed_for_glibc_2.7/udev/udev
___________________________________________________________________
Name: svn:executable
   - *