LinHES 6.01.00

1 files changed, 62 insertions, 48 deletions

diff --git a/abs/core/udev/PKGBUILD b/abs/core/udev/PKGBUILD
index 7c71a08..c22b10b 100644
--- a/abs/core/udev/PKGBUILD
+++ b/abs/core/udev/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 22190 2008-12-22 18:25:11Z tpowa $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=udev
-pkgver=119
-pkgrel=10
+pkgver=135
+pkgrel=7
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
 groups=('base')
 depends=('glibc' 'coreutils' 'util-linux')
+makedepends=('kernel26') #needed to build framebuffer blacklist
 install=udev.install
 backup=(etc/udev/udev.conf
         etc/scsi_id.config
@@ -17,66 +19,78 @@ backup=(etc/udev/udev.conf
         etc/modprobe.d/framebuffer_blacklist)
 conflicts=('pcmcia-cs' 'hotplug')
 replaces=('devfsd')
+# older initscripts versions required start_udev
+conflicts=('initscripts<2008.02')
 options=(!makeflags)
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
-        migrate-udev start_udev 51-arch.rules load-modules.sh 
-        cdrom-rules.patch cdsymlinks.sh root-link.sh readme-udev-arch.txt arch-udev-rules.patch)
-md5sums=('dd299c16371c9e14e52d79744bccf4c0'
-         '49434a593918c822077bc3af765f1aff'
-         'a68a519d1ed8cbbd2f45c23eb32ea218'
-         '082e76ef9053495a5cade321817467cd'
-         '945f6d30ab458189b3c17f8e6722da1f'
-         '5de33ba31ce52ab4da47fe3ddd3c19ea'
+        81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
+        arch-udev-rules.patch readme-udev-arch.txt usb-storage.rules udev-ntfs-3g.patch mount-usb)
+md5sums=('661b9df34e1304dad10f595d95b472bb'
+         '3a955ca8e2122a48a223f9d8adf87b70'
+         'f4951f61438d69894b728212dac7318b'
+         'fca04a608009069beb786e26338a783b'
          '8424b78e9dd772e75b4ef90814807815'
          '2d6dc6842464f107bccc68cd505a6c31'
-         '780db5316a762dc5cdcf52027ab8a8eb'
-         'fab7fa68aa35f0595c0b2bd88c4dbfd9')
+         'ae216c26a6a5cae4a3ef9c0e1f7bfaa6'
+         '7fc6d33bb218e752302eef0a80ff0a89'
+	 '11eaec41b77746f50975d4ef834c8f83')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 < ../udev-ntfs-3g.patch || return 1
+  ./configure --prefix="" --mandir=/usr/share/man --includedir=/usr/include
   make || return 1
-  make INSTALL=/bin/install DESTDIR=$startdir/pkg install \
-    EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id extras/firmware extras/floppy extras/scsi_id extras/usb_id extras/volume_id extras/path_id extras/rule_generator"
+  make DESTDIR=$startdir/pkg install
+
+  # Fix pkgconfig path
+  install -d -m755 $pkgdir/usr/lib
+  mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib
+
+  # Non-stock rules still go in /etc
+  install -D -m644 $srcdir/81-arch.rules $pkgdir/etc/udev/rules.d/81-arch.rules
+  install -D -m644 $srcdir/usb-storage.rules $pkgdir/etc/udev/rules.d/usb-storage.rules
+
+  # Scripts needed
+  mkdir $pkgdir/etc/udev/scripts
+  install -D -m744 $srcdir/mount-usb $pkgdir/etc/udev/scripts
 
-  install -D -m755 extras/path_id/path_id $startdir/pkg/sbin/path_id
-  install -D -m755 $startdir/src/start_udev $startdir/pkg/etc/start_udev
-  install -D -m755 $startdir/src/migrate-udev $startdir/pkg/sbin/migrate-udev
-  install -D -m644 $startdir/src/51-arch.rules $startdir/pkg/etc/udev/rules.d/51-arch.rules
   # install our module loading subsystem
-  install -D -m755 $startdir/src/load-modules.sh $startdir/pkg/lib/udev/load-modules.sh
+  install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
+  install -d -m755 $pkgdir/bin
+  gcc -Wall $CFLAGS -o $pkgdir/bin/resolve-modalias $srcdir/resolve-modalias.c
   # install cdsymlinks.sh
-  install -D -m755 $startdir/src/cdsymlinks.sh $startdir/pkg/lib/udev/cdsymlinks.sh
+  install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
   # install root-link.sh
-  install -D -m755 $startdir/src/root-link.sh $startdir/pkg/lib/udev/root-link.sh
+  install -D -m755 $srcdir/root-link.sh $pkgdir/lib/udev/root-link.sh
+
   # install instructions
-  install -D -m644 $startdir/src/readme-udev-arch.txt $startdir/pkg/etc/udev/readme-udev-arch.txt
+  # NOTE: We should delete this file
+  install -D -m644 $srcdir/readme-udev-arch.txt $pkgdir/usr/share/udev/readme-udev-arch.txt
+
   # add devices dir
-  mkdir $startdir/pkg/lib/udev/devices
-  # disable error loggin to prevent startup failures printed to vc on boot
-  sed -i -e 's|udev_log="err"|udev_log="0"|g' $startdir/pkg/etc/udev/udev.conf
+  mkdir $pkgdir/lib/udev/devices
+  # disable error logging to prevent startup failures printed to vc on boot
+  sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf
   # install additional rules files
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/etc/udev/packages/40-pilot-links.rules $startdir/pkg/etc/udev/rules.d/
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/etc/udev/packages/64-device-mapper.rules $startdir/pkg/etc/udev/rules.d/
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/etc/udev/packages/64-md-raid.rules $startdir/pkg/etc/udev/rules.d/
-  # fix 60-cdrom_id.rules
-  cd $startdir/pkg/etc/udev/rules.d/
-  patch -Np0 -i $startdir/src/cdrom-rules.patch || return 1
-  # fix standard udev rules to fit to arch
-  patch -Np0 -i $startdir/src/arch-udev-rules.patch || return 1
-  # fix program paths in rules files
-  for i in vol_id cdrom_id ata_id scsi_id path_id edd_id usb_id; do
-	sed -i -e "s#$i#/lib/udev/$i#g" $startdir/pkg/etc/udev/rules.d/*
+  for rule in $srcdir/$pkgname-$pkgver/rules/packages/*.rules; do
+      install -D -m 644 $rule $pkgdir/lib/udev/rules.d/
   done
-  # fix modprobe rules to use the load-modules.sh
-  sed -i -e "s#/sbin/modprobe#/lib/udev/load-modules.sh#g" $startdir/pkg/etc/udev/rules.d/*
-  # disable persistent cdromsymlinks and network by default
-  mv $startdir/pkg/etc/udev/rules.d/75-persistent-net-generator.rules \
-     $startdir/pkg/etc/udev/rules.d/75-persistent-net-generator.rules.optional
-  mv $startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules \
-     $startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules.optional
+  # fix standard udev rules to fit to arch
+  cd $pkgdir/lib/udev/rules.d/
+  patch -Np1 -i $srcdir/arch-udev-rules.patch || return 1
+
+  # remove the md-raid rules which are now provided by the mdadm package
+  rm -f $pkgdir/lib/udev/rules.d/64-md-raid.rules
+
+  # disable persistent cdromsymlinks and network by default 
+  # and move it to /etc/udev/rules.d
+  mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \
+     $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional
+  mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \
+     $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional
   # create framebuffer blacklist
-  mkdir -p $startdir/pkg/etc/modprobe.d/
-  for mod in $(find /lib/modules/ -name '*fb*.ko' -exec basename {} .ko \;); do 
-	echo "blacklist $mod" >> $startdir/pkg/etc/modprobe.d/framebuffer_blacklist
+  mkdir -p $pkgdir/etc/modprobe.d/
+  for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko' -exec basename {} .ko \;); do 
+	echo "blacklist $mod" >> $pkgdir/etc/modprobe.d/framebuffer_blacklist
   done
 }