[arch-commits] Commit in udisks/repos (8 files)

Evangelos Foutras foutrelis at archlinux.org
Fri Jun 19 17:02:20 UTC 2015


    Date: Friday, June 19, 2015 @ 19:02:20
  Author: foutrelis
Revision: 241046

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  udisks/repos/staging-i686/
  udisks/repos/staging-i686/PKGBUILD
    (from rev 241045, udisks/trunk/PKGBUILD)
  udisks/repos/staging-i686/drop-pci-db.patch
    (from rev 241045, udisks/trunk/drop-pci-db.patch)
  udisks/repos/staging-i686/udisks.service
    (from rev 241045, udisks/trunk/udisks.service)
  udisks/repos/staging-x86_64/
  udisks/repos/staging-x86_64/PKGBUILD
    (from rev 241045, udisks/trunk/PKGBUILD)
  udisks/repos/staging-x86_64/drop-pci-db.patch
    (from rev 241045, udisks/trunk/drop-pci-db.patch)
  udisks/repos/staging-x86_64/udisks.service
    (from rev 241045, udisks/trunk/udisks.service)

----------------------------------+
 staging-i686/PKGBUILD            |   60 +++++++++++++++++++++++++++++++++++++
 staging-i686/drop-pci-db.patch   |   28 +++++++++++++++++
 staging-i686/udisks.service      |   10 ++++++
 staging-x86_64/PKGBUILD          |   60 +++++++++++++++++++++++++++++++++++++
 staging-x86_64/drop-pci-db.patch |   28 +++++++++++++++++
 staging-x86_64/udisks.service    |   10 ++++++
 6 files changed, 196 insertions(+)

Copied: udisks/repos/staging-i686/PKGBUILD (from rev 241045, udisks/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-06-19 17:02:20 UTC (rev 241046)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+
+pkgname=udisks
+pkgver=1.0.5
+pkgrel=2
+pkgdesc="Disk Management Service"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/udisks"
+license=('GPL')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit'
+         'parted' 'device-mapper' 'libatasmart' 'lsof' 'libgudev')
+makedepends=('intltool' 'docbook-xsl')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+        udisks.service
+        drop-pci-db.patch)
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # https://bugs.freedesktop.org/show_bug.cgi?id=90778
+  sed -i '1i #include <sys/stat.h>' src/helpers/job-drive-detach.c
+}
+
+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
+  # fix mdadm location
+  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+            "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
+  chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
+
+  # move udev helpers and rules to /usr/lib
+  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
+  rm -r "${pkgdir}"/lib
+
+  # move umount helper to /usr/bin
+  mv "${pkgdir}"/sbin/umount.udisks "${pkgdir}"/usr/bin/
+  rm -r "${pkgdir}"/sbin
+
+  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=('70d48dcfe523a74cd7c7fbbc2847fcdd'
+         '5d80832b4d4da72beeb45c15b63a1481'
+         '773cccd70afd18ace4332037feff67ec')

Copied: udisks/repos/staging-i686/drop-pci-db.patch (from rev 241045, udisks/trunk/drop-pci-db.patch)
===================================================================
--- staging-i686/drop-pci-db.patch	                        (rev 0)
+++ staging-i686/drop-pci-db.patch	2015-06-19 17:02:20 UTC (rev 241046)
@@ -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)

Copied: udisks/repos/staging-i686/udisks.service (from rev 241045, udisks/trunk/udisks.service)
===================================================================
--- staging-i686/udisks.service	                        (rev 0)
+++ staging-i686/udisks.service	2015-06-19 17:02:20 UTC (rev 241046)
@@ -0,0 +1,10 @@
+[Unit]
+Description=UDisks
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks
+ExecStart=/usr/lib/udisks/udisks-daemon
+
+[Install]
+WantedBy=graphical.target

Copied: udisks/repos/staging-x86_64/PKGBUILD (from rev 241045, udisks/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-06-19 17:02:20 UTC (rev 241046)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+
+pkgname=udisks
+pkgver=1.0.5
+pkgrel=2
+pkgdesc="Disk Management Service"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/udisks"
+license=('GPL')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit'
+         'parted' 'device-mapper' 'libatasmart' 'lsof' 'libgudev')
+makedepends=('intltool' 'docbook-xsl')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+        udisks.service
+        drop-pci-db.patch)
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # https://bugs.freedesktop.org/show_bug.cgi?id=90778
+  sed -i '1i #include <sys/stat.h>' src/helpers/job-drive-detach.c
+}
+
+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
+  # fix mdadm location
+  sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+            "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
+  chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
+
+  # move udev helpers and rules to /usr/lib
+  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
+  rm -r "${pkgdir}"/lib
+
+  # move umount helper to /usr/bin
+  mv "${pkgdir}"/sbin/umount.udisks "${pkgdir}"/usr/bin/
+  rm -r "${pkgdir}"/sbin
+
+  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=('70d48dcfe523a74cd7c7fbbc2847fcdd'
+         '5d80832b4d4da72beeb45c15b63a1481'
+         '773cccd70afd18ace4332037feff67ec')

Copied: udisks/repos/staging-x86_64/drop-pci-db.patch (from rev 241045, udisks/trunk/drop-pci-db.patch)
===================================================================
--- staging-x86_64/drop-pci-db.patch	                        (rev 0)
+++ staging-x86_64/drop-pci-db.patch	2015-06-19 17:02:20 UTC (rev 241046)
@@ -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)

Copied: udisks/repos/staging-x86_64/udisks.service (from rev 241045, udisks/trunk/udisks.service)
===================================================================
--- staging-x86_64/udisks.service	                        (rev 0)
+++ staging-x86_64/udisks.service	2015-06-19 17:02:20 UTC (rev 241046)
@@ -0,0 +1,10 @@
+[Unit]
+Description=UDisks
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks
+ExecStart=/usr/lib/udisks/udisks-daemon
+
+[Install]
+WantedBy=graphical.target



More information about the arch-commits mailing list