[arch-commits] Commit in udev/repos (4 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Aug 2 16:29:45 UTC 2009
Date: Sunday, August 2, 2009 @ 12:29:45
Author: tpowa
Revision: 48501
Merged revisions 48496,48499 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/udev/trunk
........
r48496 | tpowa | 2009-08-02 16:04:54 +0000 (So, 02 Aug 2009) | 1 line
upgpkg: udev 145-1
........
r48499 | tpowa | 2009-08-02 16:27:41 +0000 (So, 02 Aug 2009) | 1 line
upgpkg: udev 145-1
........
Modified:
udev/repos/testing-i686/ (properties)
udev/repos/testing-i686/PKGBUILD
udev/repos/testing-i686/arch-udev-rules.patch
Deleted:
udev/repos/testing-i686/udev-140-default.patch
------------------------+
PKGBUILD | 22 +++++++++++++---------
arch-udev-rules.patch | 14 +++++---------
udev-140-default.patch | 23 -----------------------
3 files changed, 18 insertions(+), 41 deletions(-)
Property changes on: udev/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /udev/trunk:1-46746
+ /udev/trunk:1-48500
Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2009-08-02 16:28:18 UTC (rev 48500)
+++ testing-i686/PKGBUILD 2009-08-02 16:29:45 UTC (rev 48501)
@@ -3,15 +3,15 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
# Maintainer: Thomas Bächler <thomas at archlinux.org>
pkgname=udev
-pkgver=141
-pkgrel=5
+pkgver=145
+pkgrel=1
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
+depends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2')
+makedepends=('kernel26' 'gperf' 'libxslt') #kernel26 needed to build framebuffer blacklist
install=udev.install
backup=(etc/udev/udev.conf
etc/scsi_id.config
@@ -21,22 +21,25 @@
replaces=('devfsd')
# older initscripts versions required start_udev
conflicts=('initscripts<2009.07')
-options=(!makeflags)
+options=(!makeflags !libtool)
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
arch-udev-rules.patch ignore-remove.sh)
-md5sums=('1670fe81cabf5161319c52084cf81134'
+md5sums=('b3d3b5f88c7b81e7615700a04db685e1'
'cc6406e8b67b2b8711942098a66cde6b'
'f4951f61438d69894b728212dac7318b'
'64a0169dc9d883a63ff9f8f491fdc34a'
'2e808ee78d237c478b57af2a68d43769'
'2d6dc6842464f107bccc68cd505a6c31'
- '03a82da74c5724d4a80a24a12e218abc'
+ 'aa51fa1925d70f63ee4ad4958eb7a861'
'35fa97500243a79b2370fa4684828e69')
build() {
cd $srcdir/$pkgname-$pkgver
- ./configure --prefix="" --mandir=/usr/share/man --includedir=/usr/include
+ ./configure --prefix="" --mandir=/usr/share/man\
+ --includedir=/usr/include\
+ --libexecdir=/lib/udev\
+ --datarootdir=/usr/share
make || return 1
make DESTDIR=$startdir/pkg install
# Fix pkgconfig path
@@ -58,7 +61,6 @@
install -D -m755 $srcdir/ignore-remove.sh $pkgdir/lib/udev/ignore-remove.sh
# 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 standard rules files
for rule in $srcdir/$pkgname-$pkgver/rules/packages/*.rules; do
install -D -m 644 $rule $pkgdir/lib/udev/rules.d/
@@ -66,6 +68,8 @@
# 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 .orig files
+ rm -f pkgdir/lib/udev/rules.d/*.orig
# 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 \
Modified: testing-i686/arch-udev-rules.patch
===================================================================
--- testing-i686/arch-udev-rules.patch 2009-08-02 16:28:18 UTC (rev 48500)
+++ testing-i686/arch-udev-rules.patch 2009-08-02 16:29:45 UTC (rev 48501)
@@ -13,22 +13,22 @@
# cdrom
-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
-SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
--SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
+-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
-KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
-KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"
+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="optical", MODE="0660"
+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="optical", MODE="0660"
-+SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660"
++SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660"
+KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="optical", MODE="0660"
+KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="optical", MODE="0660"
# tape
-KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
-KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
--SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
+-SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
+KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="storage", MODE="0660"
+KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="storage", MODE="0660"
-+SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660"
++SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660"
# block-releated
KERNEL=="sch[0-9]*", GROUP="disk"
@@ -54,7 +54,7 @@
diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
--- rules.d/80-drivers.rules 2009-03-07 22:22:48.200242883 +0100
+++ rules.d.arch/80-drivers.rules 2009-03-07 22:22:54.757744454 +0100
-@@ -2,15 +2,16 @@
+@@ -2,13 +2,14 @@
ACTION!="add", GOTO="drivers_end"
@@ -62,9 +62,7 @@
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -b tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -b tifm_ms"
-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"
--SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -b mmc_block"
-SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block"
--SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/sbin/modprobe -b ch"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
@@ -72,9 +70,7 @@
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
-+SUBSYSTEM=="mmc", RUN+="/lib/udev/load-modules.sh mmc_block"
+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
-+SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/lib/udev/load-modules.sh ch"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
Deleted: testing-i686/udev-140-default.patch
===================================================================
--- testing-i686/udev-140-default.patch 2009-08-02 16:28:18 UTC (rev 48500)
+++ testing-i686/udev-140-default.patch 2009-08-02 16:29:45 UTC (rev 48501)
@@ -1,23 +0,0 @@
-From: Kay Sievers <kay.sievers at vrfy.org>
-Date: Wed, 18 Mar 2009 01:32:12 +0000 (+0100)
-Subject: rules: fix extra quote in 50-udev-default.rules
-X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=3b8103d45f99218f44b4ea87ab4284f6a253409b
-
-rules: fix extra quote in 50-udev-default.rules
-
-Patch from Gerardo Exequiel Pozzi.
----
-
-diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
-index 38b954d..240cb3b 100644
---- a/rules/rules.d/50-udev-default.rules
-+++ b/rules/rules.d/50-udev-default.rules
-@@ -107,7 +107,7 @@ KERNEL=="hw_random", NAME="hwrng"
- KERNEL=="mmtimer", MODE="0644"
- KERNEL=="rflash[0-9]*", MODE="0400"
- KERNEL=="rrom[0-9]*", MODE="0400"
--KERNEL=="sxctl", NAME="specialix_sxctl""
-+KERNEL=="sxctl", NAME="specialix_sxctl"
- KERNEL=="rioctl", NAME="specialix_rioctl"
- KERNEL=="iowarrior[0-9]*", NAME="usb/%k"
- KERNEL=="hiddev[0-9]*", NAME="usb/%k"
More information about the arch-commits
mailing list