X-Git-Url: http://gitweb/?a=blobdiff_plain;f=udev%2FPkgfile;h=2bad3e2461e4e82b3e53d8caacda38c1fbf550ce;hb=2425423194b77b6b290af5aaf1384cb4319ac6da;hp=0bcb392ffc0e73c6fc95c269bc2f88d9d650dfe9;hpb=be0c29c60d6c6c3db9f440591a4a121dbb408936;p=crossrootfs.git

diff --git a/udev/Pkgfile b/udev/Pkgfile
index 0bcb392..2bad3e2 100644
--- a/udev/Pkgfile
+++ b/udev/Pkgfile
@@ -1,62 +1,50 @@
 # 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
-# Depends on:
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 
 name=udev
-version=149
-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)
+version=182
+release=2
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.xz \
+        81-crux.rules start_udev)
 
 build() {
   cd udev-$version
-  
+
+  # Forcing libtool to prioritize our sysroot
+  sed "s|lt_sysroot=|lt_sysroot=$CLFS|g" -i m4/libtool.m4
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
-              --exec-prefix= \
+              --sbindir=/sbin --bindir=/sbin \
               --sysconfdir=/etc \
-              --libexecdir=/lib/udev \
+              --with-rootlibdir=/lib \
+              --with-rootprefix= \
+              --libexecdir=/lib \
               --mandir=/usr/man \
-              --disable-extras \
-              --disable-introspection
+              --disable-introspection \
+              --disable-gudev \
+              --disable-udev_acl \
+              --disable-keymap \
+              --enable-static \
+              --enable-rule_generator \
+              --with-pci-ids-path=$CLFS/usr/share
 
   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
-
-  # Fix location of devel lib
-  rm $PKG/lib/libudev.so
-  ln -sf ../../lib/libudev.so.0.5.0 $PKG/usr/lib/libudev.so
-
-  # Populate nodes
-  mknod -m 600 $PKG/lib/udev/devices/console c 5 1
-  mknod -m 666 $PKG/lib/udev/devices/null c 1 3
-  mknod -m 666 $PKG/lib/udev/devices/zero c 1 5
-  ln -s /proc/self/fd $PKG/lib/udev/devices/fd
-  ln -s /proc/self/fd/0 $PKG/lib/udev/devices/stdin
-  ln -s /proc/self/fd/1 $PKG/lib/udev/devices/stdout
-  ln -s /proc/self/fd/2 $PKG/lib/udev/devices/stderr
-  ln -s /proc/kcore $PKG/lib/udev/devices/core
-
-  # Add CRUX items + LFS rules
-  install -m 0755 $SRC/start_udev $PKG/sbin
+  mkdir -p $PKG/{lib,sbin,run}
 
-  pushd $SRC/udev-config-20090523
-  make DESTDIR=$PKG RULES_DIR=/lib/udev/rules.d install
-  popd
+  # Symlink to udevd
+  ln -s ../lib/udev/udevd $PKG/sbin/udevd
 
-  # Keep udevinfo for legacy support
-  mkdir -p $PKG/usr/bin
-  ln -s /sbin/udevadm $PKG/usr/bin/udevinfo
+  # Add CRUX items
+  install -m 0755 $SRC/start_udev $PKG/sbin
+  install -m 0644 $SRC/81-crux.rules $PKG/lib/udev/rules.d
 
   # Remove junk
-  rm -rf $PKG/usr/share/{gtk-,}doc
-  rm $PKG/lib/libudev.la
+  rm -r $PKG/usr/share/{gtk-,}doc
 }