summaryrefslogtreecommitdiff
path: root/source/a/udev/udev.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/udev/udev.SlackBuild')
-rwxr-xr-xsource/a/udev/udev.SlackBuild62
1 files changed, 32 insertions, 30 deletions
diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild
index c6f83a0e..183c6667 100755
--- a/source/a/udev/udev.SlackBuild
+++ b/source/a/udev/udev.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-5}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -58,29 +58,35 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# So this is a major bug. At least, it triggers one in the kernel.
-# We'll revert it for now. If left in place, machines using ATA
-# (especially PATA) are liable to randomly crash on reboot.
-# The last little bit of this patch fails to reverse but it won't matter.
-if [ $VERSION = 165 ]; then
- zcat $CWD/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz | patch -p1 -R
-fi
+# Fix ata_id (remove with udev-186+)
+zcat $CWD/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch.gz | patch -p1 || exit 1
+
+# Fix 42-usb-hid-pm.rules (remove with udev-187+)
+zcat $CWD/fix-42-usb-hid-pm.rules.diff.gz | patch -p1 --verbose || exit 1
# Fixup the rule generator for our use
-zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1
+zcat $CWD/rule_generator.diff.gz | patch -p1 --verbose || exit 1
# static libudev is needed for lvm2
+# --enable-udev_acl was removed (will be part of future CK release)
+# --enable-floppy support was also disabled by default in 173
+# --enable-rule_generator was disabled by default in 175
./configure \
- --enable-static \
--prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/sbin \
+ --with-rootprefix=/ \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-rootlibdir=/lib${LIBDIRSUFFIX} \
- --libexecdir=/lib/udev \
- --disable-introspection \
+ --with-firmware-path=/lib/firmware/updates:/lib/firmware \
+ --sysconfdir=/etc \
+ --bindir=/sbin \
+ --sbindir=/sbin \
+ --libexecdir=/lib \
+ --enable-introspection \
--mandir=/usr/man \
--docdir=/usr/doc/udev-$VERSION \
+ --enable-floppy \
+ --enable-static \
+ --enable-rule_generator \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
@@ -92,8 +98,13 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
# scsi_id is needed by multipath
( cd $PKG/sbin ; ln -s ../lib/udev/scsi_id scsi_id )
+# Put udevd back in /sbin
+mv $PKG/lib/udev/udevd $PKG/sbin
+ln -s /sbin/udevd $PKG/lib/udev/udevd
+
mkdir -p \
- $PKG/etc/modprobe.d \
+ $PKG/run \
+ $PKG/{etc,lib}/modprobe.d \
$PKG/etc/rc.d \
$PKG/etc/udev/rules.d \
$PKG/lib/firmware
@@ -106,32 +117,23 @@ cp -a $CWD/config/rules.d/* $PKG/lib/udev/rules.d/
# Now the init script and module-init-tools stuff
cp -a $CWD/config/rc.d/rc.udev.new $PKG/etc/rc.d/rc.udev.new
-cp -a $CWD/config/modprobe.d/* $PKG/etc/modprobe.d
+cp -a $CWD/config/modprobe.d/*.conf $PKG/lib/modprobe.d/
+cp -a $CWD/config/modprobe.d/README $PKG/etc/modprobe.d/
-chown -R root:root $PKG/etc
-find $PKG/etc -type f -exec chmod 644 {} \;
+chown -R root:root $PKG/etc $PKG/lib/modprobe.d
+find $PKG/etc $PKG/lib/modprobe.d -type f -exec chmod 644 {} \;
find $PKG/etc -type d -exec chmod 755 {} \;
chmod 0755 $PKG/etc/rc.d/rc.udev.new
# Add extra device nodes to the package that udev doesn't make:
-# As of 156, some of these aren't be needed any more:
-# removed core@ fd@ stderr@ stdin@ stdout@
tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG
-# Add various helper scripts:
-for file in $CWD/config/scripts/* ; do
- cp -a $file $PKG/lib/udev/
-done
chown -R root:root $PKG/lib/udev
chmod 0755 $PKG/lib/udev/*
-# Move the pkgconfig file to where we expect it
-mv $PKG/usr/share/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-rmdir $PKG/usr/share/pkgconfig
-
mkdir -p $PKG/usr/doc/udev-$VERSION
cp -a \
- COPYING* README* TODO extras/keymap/README.keymap.txt \
+ COPYING* README* TODO \
$PKG/usr/doc/udev-$VERSION
# Don't package the API docs: