[arch-commits] Commit in udev/repos (4 files)

Tobias Powalowski tpowa at archlinux.org
Fri Nov 27 05:26:51 EST 2009


    Date: Friday, November 27, 2009 @ 05:26:51
  Author: tpowa
Revision: 59753

Merged revisions 59383,59752 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/udev/trunk

........
  r59383 | andyrtr | 2009-11-22 23:37:58 +0100 (So, 22 Nov 2009) | 1 line
  
  split pkg/add udev-compat pkg needed for older(LTS) kernels
........
  r59752 | tpowa | 2009-11-27 11:26:07 +0100 (Fr, 27 Nov 2009) | 2 lines
  
  upgpkg: udev 147-1
      bump to new latest version
........

Modified:
  udev/repos/testing-x86_64/	(properties)
  udev/repos/testing-x86_64/PKGBUILD
  udev/repos/testing-x86_64/arch-udev-rules.patch
Deleted:
  udev/repos/testing-x86_64/cups-hplip-fix.patch

-----------------------+
 PKGBUILD              |   58 +++++++++++++++++++++++++++++-------------------
 arch-udev-rules.patch |   14 +++++------
 cups-hplip-fix.patch  |   33 ---------------------------
 3 files changed, 43 insertions(+), 62 deletions(-)


Property changes on: udev/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /udev/trunk:1-58304
   + /udev/trunk:1-59752

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-11-27 10:26:07 UTC (rev 59752)
+++ testing-x86_64/PKGBUILD	2009-11-27 10:26:51 UTC (rev 59753)
@@ -2,53 +2,55 @@
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
-pkgname=udev
-pkgver=146
-pkgrel=3
-pkgdesc="The userspace dev tools (udev)"
+
+pkgbase="udev"
+pkgname=('udev' 'udev-compat')
+pkgver=147
+pkgrel=1
 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' 'libusb' 'glib2')
-makedepends=('kernel26' 'gperf' 'libxslt') #kernel26 needed to build framebuffer blacklist 
-install=udev.install
-backup=(etc/udev/udev.conf
-        etc/modprobe.d/framebuffer_blacklist.conf)
-conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
-replaces=('devfsd')
 # older initscripts versions required start_udev
 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 cups-hplip-fix.patch)
-md5sums=('b2a8acefda4fa8a70d45642035abd718'
+        arch-udev-rules.patch ignore-remove.sh)
+md5sums=('aed0129c5a00e01d1be75ffda7d2e0f1'
          'cc6406e8b67b2b8711942098a66cde6b'
          'f4951f61438d69894b728212dac7318b'
          '64a0169dc9d883a63ff9f8f491fdc34a'
          '2e808ee78d237c478b57af2a68d43769'
          '2d6dc6842464f107bccc68cd505a6c31'
-         '24207d84eae19d4f08422b89ce6c55c5'
-         '35fa97500243a79b2370fa4684828e69'
-         '8cd53a3d91d2321a646033dc18f29217')
-
+         'bbfa83a7a5fa889b663343b920603f3c'
+         '35fa97500243a79b2370fa4684828e69')
 build() {
   cd $srcdir/$pkgname-$pkgver
-  # fix raw printers, will be fixed in udev-147
-  patch -Np1 -i ../cups-hplip-fix.patch || return 1
   ./configure --prefix="" --mandir=/usr/share/man\
                           --includedir=/usr/include\
                           --libexecdir=/lib/udev\
                           --datarootdir=/usr/share
   make || return 1
-  make DESTDIR=$startdir/pkg install
+}
+  
+package_udev() {
+  pkgdesc="The userspace dev tools (udev)"
+  depends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2')
+  makedepends=('kernel26' 'gperf' 'libxslt' 'gobject-introspection') #kernel26 needed to build framebuffer blacklist 
+  install=udev.install
+  backup=(etc/udev/udev.conf
+          etc/modprobe.d/framebuffer_blacklist.conf)
+  conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
+  replaces=('devfsd')
+  
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} 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 our rule for permissions and symlinks
   install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
-
   # install our module loading subsystem
   install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
   install -d -m755 $pkgdir/bin
@@ -80,6 +82,8 @@
   rm $pkgdir/lib/udev/rules.d/40-ia64.rules
   rm $pkgdir/lib/udev/rules.d/40-ppc.rules
   rm $pkgdir/lib/udev/rules.d/40-s390.rules
+  rm $pkgdir/lib/udev/rules.d/64-device-mapper.rules
+  rm $pkgdir/lib/udev/rules.d/64-md-raid.rules
 
   # create framebuffer blacklist
   mkdir -p $pkgdir/etc/modprobe.d/
@@ -120,3 +124,13 @@
     sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g' $i
   done
 }
+
+package_udev-compat() {
+  pkgdesc="The userspace dev tools (udev) - additional rules for older kernels"
+  depends=('udev')
+
+  cd $srcdir/$pkgname-$pkgver
+  install -d -m755 ${pkgdir}/lib/${pkgname}/rules.d
+  install -D -m644 ${srcdir}/${pkgname}-${pkgver}/rules/gentoo/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
+}
+

Modified: testing-x86_64/arch-udev-rules.patch
===================================================================
--- testing-x86_64/arch-udev-rules.patch	2009-11-27 10:26:07 UTC (rev 59752)
+++ testing-x86_64/arch-udev-rules.patch	2009-11-27 10:26:51 UTC (rev 59753)
@@ -14,13 +14,13 @@
 -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
 -SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", 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"
+-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
+-KERNEL=="pktcdvd", 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"
 +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"
++KERNEL=="pktcdvd[0-9]*", GROUP="optical", MODE="0660"
++KERNEL=="pktcdvd", GROUP="optical", MODE="0660"
  
  # tape
 -KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
@@ -30,14 +30,14 @@
 +KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="storage", MODE="0660"
 +SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660"
  
- # block-releated
+ # block-related
  KERNEL=="sch[0-9]*", GROUP="disk"
 @@ -116,5 +116,4 @@
- KERNEL=="cpad[0-9]*",		NAME="usb/%k"
+ KERNEL=="rrom[0-9]*",		MODE="0400"
  
  # do not delete static device nodes
+-ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
 -ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
--ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
 +ACTION=="remove", PROGRAM="ignore-remove.sh %r", OPTIONS+="ignore_remove"
 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

Deleted: testing-x86_64/cups-hplip-fix.patch
===================================================================
--- testing-x86_64/cups-hplip-fix.patch	2009-11-27 10:26:07 UTC (rev 59752)
+++ testing-x86_64/cups-hplip-fix.patch	2009-11-27 10:26:51 UTC (rev 59753)
@@ -1,33 +0,0 @@
-From: Martin Pitt <martin.pitt at ubuntu.com>
-Date: Fri, 4 Sep 2009 15:12:28 +0000 (+0200)
-Subject: make raw USB printer devices accessible for lp
-X-Git-Url: http://git.kernel.org/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=f61e72d8973cf9d889a4f1233150870085c0b3e1
-
-make raw USB printer devices accessible for lp
-
-Starting from version 1.4, cups now uses libusb and printer USB devices instead
-of the usblp generated /dev/usb/lpX ones. In order to not require the cups USB
-backend to run as root now, change raw USB printer devices to be root:lp 0660,
-similar to usblpX devices.
-
-This might also enable the hplip backend to not run as root, since this has
-always used raw device nodes.
-
-https://launchpad.net/bugs/420015
----
-
-diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
-index 2507420..4e9a737 100644
---- a/rules/rules.d/50-udev-default.rules
-+++ b/rules/rules.d/50-udev-default.rules
-@@ -60,6 +60,10 @@ SUBSYSTEM=="ppdev",		GROUP="lp"
- SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
- KERNEL=="lp[0-9]*",		GROUP="lp"
- KERNEL=="irlpt[0-9]*",		GROUP="lp"
-+# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
-+# the ones from the old usblp kernel module
-+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
-+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="660"
- 
- # block
- SUBSYSTEM=="block", GROUP="disk"



More information about the arch-commits mailing list