[Lunar-commits] <moonbase> udev: Additional changes to perfect install on both archs

[Stefan Wold]

commit ea520880465658d3f01c2305a5aad5bd3bff36eb
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Fri Feb 26 07:38:50 2010 +0100

    udev: Additional changes to perfect install on both archs
    
    * Fixed proper path for pkgconfig, ConsoleKit, girepository
    * Removed mount --bind cruft, shouldn't be needed anymore
    * Added creation of additional devices
---
 filesys/udev/BUILD        |   26 +++++++++++++++++++++-----
 filesys/udev/DEPENDS      |    5 +++++
 filesys/udev/DETAILS      |   10 +++++-----
 filesys/udev/POST_INSTALL |   35 +++--------------------------------
 4 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/filesys/udev/BUILD b/filesys/udev/BUILD
index b51ec6d..bd6c886 100644
--- a/filesys/udev/BUILD
+++ b/filesys/udev/BUILD
@@ -1,14 +1,26 @@
 (
 
-    # add missing groups:
-    add_priv_group dialout
+    # make sure all required groups are present:
     add_priv_group usb
     add_priv_group cdrw
+    add_priv_group disk
+    add_priv_group cdrom
+    add_priv_group floppy
+    add_priv_group tape
+    add_priv_group audio
+    add_priv_group video
+    add_priv_group lp
+    add_priv_group tty
+    add_priv_group dialout
+    add_priv_group kmem
 
     # create static nodes dir if missing
     mkdir -p /lib/udev/devices  &&
 
     patch_it $SOURCE2 0 &&
+    sedit "/^pkgconfigdir/s;.*;pkgconfigdir = /usr/lib/pkgconfig;" Makefile.in &&
+    sedit '/$(DESTDIR)$(prefix)\/lib\/ConsoleKit/s;$(DESTDIR)$(prefix);/usr;g' Makefile.in &&
+
     find $SOURCE_DIRECTORY/rules -type f -name '*.rules' -exec sed -i 's/uucp/dialout/g' {} \;  &&
 
 # Borrowing from the Arch folks to avoid any user related permissions.
@@ -20,9 +32,13 @@
        rm -f /etc/udev/rules.d/70-persistent-{cd,net}.rules
     fi  &&
 
-    ./configure  --prefix=/usr       \
-                 --exec-prefix=      \
-                 --sysconfdir=/etc  &&
+    ./configure  --prefix=""               \
+                 --libexecdir=/lib/udev    \
+                 --mandir=/usr/share/man   \
+                 --includedir=/usr/include \
+                 --datarootdir=/usr/share  \
+                 --sysconfdir=/etc         &&
+    sedit '/^GIRTYPELIBDIR/s;\${exec_prefix};/usr;' Makefile  &&
     default_make  &&
 
     # install the init.d script
diff --git a/filesys/udev/DEPENDS b/filesys/udev/DEPENDS
index c0688c1..3f6d49a 100644
--- a/filesys/udev/DEPENDS
+++ b/filesys/udev/DEPENDS
@@ -1,3 +1,8 @@
 depends lunar-init
 depends sysfsutils
 depends gperf
+depends gobject-introspection
+
+optional_depends "acl"      "" "" "to build acl helpful extras"
+optional_depends "usbutils" "" "" "to build usb helpful extras"
+optional_depends "pciutils" "" "" "to build pci helpful extras"
diff --git a/filesys/udev/DETAILS b/filesys/udev/DETAILS
index 8edb29e..2c06723 100644
--- a/filesys/udev/DETAILS
+++ b/filesys/udev/DETAILS
@@ -1,17 +1,17 @@
           MODULE=udev
-         VERSION=141
+         VERSION=151
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=udev-140-rules.patch.bz2
+         SOURCE2=$MODULE-$VERSION-rules.patch.bz2
          SOURCE3=raid-devfs.sh-udev-088
       SOURCE_URL=$KERNEL_URL/pub/linux/utils/kernel/hotplug
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:f82279e4b4759b9e3134f99a538ccd1a437bf7f0
-     SOURCE2_VFY=sha1:4b067494c6ccc8ebda585b0edfa2eab8b26b8ebb
+      SOURCE_VFY=sha1:04bab1fd73797815b0f2412edcf1070acd35bce1
+     SOURCE2_VFY=sha1:63b110d0f0c22e780503f5834f6884ffca5601c6
      SOURCE3_VFY=sha1:44a12035774c2b42b784267d38e61a34aa0b645b
         WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
          ENTERED=20040104
-         UPDATED=20090409
+         UPDATED=20100226
       MAINTAINER=moe at lunar-linux.org
            SHORT="hotplug and device handling daemon"
 
diff --git a/filesys/udev/POST_INSTALL b/filesys/udev/POST_INSTALL
index 11467ab..8eaddc2 100644
--- a/filesys/udev/POST_INSTALL
+++ b/filesys/udev/POST_INSTALL
@@ -16,15 +16,6 @@ create_node()
   local MINOR=$5
   local SYMLINK=$6
 
-  echo -ne "\tTesting for /dev/${NODE}: "
-
-  if [ -e ${DEVPREFIX}/${NODE} ]; then
-     echo "node already present."
-  else
-     mknod -m $PERMS ${DEVPREFIX}/${NODE} ${TYPE} ${MAJOR} ${MINOR} || { echo "cannot create node."; exit 1; }
-     echo "node created."
-  fi
-
   echo -ne "\tTesting for ${STATICDIR}/${NODE}: "
 
   if [ -e ${STATICDIR}/${NODE} ]; then
@@ -34,33 +25,13 @@ create_node()
      echo "static node created in $STATICDIR"
   fi
 
-  test -z "${SYMLINK}" &&  return 0
-
-  echo -ne "\tTesting for /dev/${SYMLINK} -> /dev/${NODE} symlink: "
-
-  if [ -e ${DEVPREFIX}/${SYMLINK} ]; then
-     if [ "`readlink ${DEVPREFIX}/${SYMLINK}`" = "${NODE}" ]; then
-        echo "already present."
-        return 0
-     fi
-     rm ${DEVPREFIX}/${SYMLINK}
-  fi
-
-  ln -sf ${NODE} ${DEVPREFIX}/${SYMLINK} || { echo "cannot create."; exit 1; }
-  echo "created."
-
   return 0
 }
 
-echo    ""
-echo -n "Creating virtual fake root... "       && mkdir ${FAKEROOT}/          && echo "done." &&
-echo -n "Creating fake root to check /dev... " && mount --bind / ${FAKEROOT}/ && echo "done." &&
-echo    "Checking /dev/ for needed static boot nodes... " &&
-
 create_node 0600 console c 5 1     &&
 create_node 0666 null    c 1 3     &&
 create_node 0600 ram0    b 1 0 ram &&
 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."
+create_node 0660 loop0   b 7 0     &&
+create_node 0666 zero    c 1 5     &&
+create_node 0660 kmsg    c 1 11