Merged changes from noeabi (72cbd18e791bd2edff0e8d23873136187f0cd936)

[crossrootfs.git] / udev / Pkgfile

diff --git a/udev/Pkgfile b/udev/Pkgfile
index b94c9e966a89156dc360b7a090d109d50f4e9c35..aa173dc16e6b3ee6bc012d6828efa1ce8a3c52e1 100644 (file)
--- a/udev/Pkgfile
+++ b/udev/Pkgfile
@@ -1,39 +1,34 @@
 # Description: Userspace device management daemon
 # URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Arch Maintainer: CRUX-ARM System Team, devel@crux-arm.nu
 # Depends on:
 
 name=udev
-version=149
-release=2
+version=141
+release=1
 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \
-       http://crux.nu/files/distfiles/udev-config-20090523.tar.bz2 \
-       start_udev)
+        http://crux.nu/files/distfiles/udev-config-20081015.tar.bz2 \
+        start_udev)
 
 build() {
   cd udev-$version
-  
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --exec-prefix= \
               --sysconfdir=/etc \
-              --libexecdir=/lib/udev \
-              --mandir=/usr/man \
-              --disable-extras \
-              --disable-introspection
+              --mandir=/usr/man
 
   make
-  make install DESTDIR=$PKG \
-       pkgconfigdir=/usr/lib/pkgconfig
+  make install DESTDIR=$PKG
 
-  mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}}
-  mkdir -p $PKG/usr/lib
+  # scsi_id + vol_id need to be multi-path
+  (cd $PKG/sbin; ln -s ../lib/udev/vol_id vol_id)
+  (cd $PKG/sbin; ln -s ../lib/udev/scsi_id scsi_id)
 
-  # Fix location of devel lib
-  rm $PKG/lib/libudev.so
-  ln -sf ../../lib/libudev.so.0.5.1 $PKG/usr/lib/libudev.so
+  mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}}
 
   # Populate nodes
   mknod -m 600 $PKG/lib/udev/devices/console c 5 1
@@ -45,21 +40,21 @@ build() {
   ln -s /proc/self/fd/2 $PKG/lib/udev/devices/stderr
   ln -s /proc/kcore $PKG/lib/udev/devices/core
 
+  # Install some upstream rules
+  cp -a rules/packages/40-alsa.rules $PKG/lib/udev/rules.d/
+
   # Add CRUX items + LFS rules
   install -m 0755 $SRC/start_udev $PKG/sbin
 
-  pushd $SRC/udev-config-20090523
+  pushd $SRC/udev-config-20081015
   make DESTDIR=$PKG RULES_DIR=/lib/udev/rules.d install
   popd
 
+  # Comment uucp lines in default rules
+  sed -i 's|.*uucp.*|#&|g' $PKG/lib/udev/rules.d/50-udev-default.rules
+  sed -i 's|.*uucp.*|#&|g' $PKG/lib/udev/rules.d/55-lfs.rules
+
   # Keep udevinfo for legacy support
   mkdir -p $PKG/usr/bin
   ln -s /sbin/udevadm $PKG/usr/bin/udevinfo
-
-  # Remove junk
-  rm -rf $PKG/usr/share/{gtk-,}doc
-  rm $PKG/lib/libudev.la
 }
-        # Fix location of devel lib
-        rm $PKG/lib/libudev.so
-        ln -sf ../../lib/libudev.so.0.5.1 $PKG/usr/lib/libudev.so