[arch-commits] Commit in udisks/trunk (PKGBUILD drop-pci-db.patch)

Tom Gundersen tomegun at archlinux.org
Thu Nov 22 14:38:37 UTC 2012


    Date: Thursday, November 22, 2012 @ 09:38:36
  Author: tomegun
Revision: 171892

upgpkg: udisks 1.0.4-6

minor fixes

Add /media as this is dropped from filesystem
Drop calling pci-db as this no longer exists and udev does it for us

Added:
  udisks/trunk/drop-pci-db.patch
Modified:
  udisks/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   19 +++++++++++++------
 drop-pci-db.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-22 14:31:09 UTC (rev 171891)
+++ PKGBUILD	2012-11-22 14:38:36 UTC (rev 171892)
@@ -1,24 +1,25 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=5
+pkgrel=6
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
 makedepends=('intltool' 'docbook-xsl')
 options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5'
-            '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
+
+  patch -p1 < ../drop-pci-db.patch
+
   make
 }
 
@@ -34,4 +35,10 @@
   install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service"
   echo "SystemdService=udisks.service" \
     >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
+
+  # install the /media folder
+  install -d -m 755 $pkgdir/media
 }
+md5sums=('86c63b2b5484f2060499a052b5b6256b'
+         '5d80832b4d4da72beeb45c15b63a1481'
+         '773cccd70afd18ace4332037feff67ec')

Added: drop-pci-db.patch
===================================================================
--- drop-pci-db.patch	                        (rev 0)
+++ drop-pci-db.patch	2012-11-22 14:38:36 UTC (rev 171892)
@@ -0,0 +1,28 @@
+commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
+Author: Tom Gundersen <teg at jklm.no>
+Date:   2 days ago
+
+    udev: remove redundant call to deprecated pci-db
+    
+    The binary is no longer shipped with systemd/udev. The functionality
+    is taken over by a builtin, which is ran for all devices, rendering
+    this rule superfluous.
+    
+    Cc: Jan de Groot <jgc at archlinux.org>
+    Signed-off-by: Tom Gundersen <teg at jklm.no>
+
+diff --git a/data/80-udisks.rules b/data/80-udisks.rules
+index d1c8c5d..4bf2b37 100644
+--- a/data/80-udisks.rules
++++ b/data/80-udisks.rules
+@@ -1,10 +1,6 @@
+ # Do not edit this file, it will be overwritten on updates
+ #
+ 
+-# import names for PCI storage controllers
+-#
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+-
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
+ # vid/pid (lower PCI device)




More information about the arch-commits mailing list