diff options
| -rw-r--r-- | pcr/eudev/PKGBUILD | 24 | ||||
| -rw-r--r-- | pcr/eudev/udev-hook | 16 | ||||
| -rw-r--r-- | pcr/eudev/udev-hwdb.hook | 3 | ||||
| -rw-r--r-- | pcr/eudev/udev-reload.hook | 11 | ||||
| -rw-r--r-- | pcr/gksu/PKGBUILD | 2 | ||||
| -rw-r--r-- | pcr/libgksu/PKGBUILD | 2 |
6 files changed, 44 insertions, 14 deletions
diff --git a/pcr/eudev/PKGBUILD b/pcr/eudev/PKGBUILD index 0d87eb9d2..8edba5b35 100644 --- a/pcr/eudev/PKGBUILD +++ b/pcr/eudev/PKGBUILD @@ -8,22 +8,26 @@ _udev_ver=220 pkgbase=eudev pkgname=('eudev' 'libeudev') pkgver=3.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="The userspace dev tools (udev) forked by Gentoo" arch=('i686' 'x86_64' 'armv7h') url="http://www.gentoo.org/proj/en/eudev/" license=('GPL') -makedepends=('gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'util-linux-nosystemd' 'libelf') +makedepends=('gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'util-linux' 'libelf') options=('!libtool') source=("$pkgname-$pkgver.tar.gz::https://github.com/gentoo/eudev/archive/v${pkgver}.tar.gz" 'initcpio_hooks' 'initcpio_install' 'udev-hwdb.hook' + 'udev-reload.hook' + 'udev-hook' 'udev-hwdb-path.patch') sha256sums=('870920011285b919fca5c60eaa5670312eeffe3883dd8cf564cd1179fc639336' '892ce43218e0a458981bbce451252c8987dc398e60b8de288e7542b8f2409c13' '77dd1fd318b4456409aceb077f060b87944defb07cf39d29ad1968dc6f361875' - '846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151' + '2782bd3a7686596e98bd2d3fdef9d59d7d439682b87bbcc43b1fd1f5fabb3505' + '13596caef6ed85b58de674ebe7c47d9c7dd676240de5cc28ef3ccee2ce1d8a90' + '80c8f87549374d3bc7c2831b9e069b0005cc5ef90122c2d02e78e27c9bc1dbed' 'e05e468d15d09fb49343f33bc8d21c08f54db3ecff412dc35d4acb0630f869a3') prepare(){ @@ -56,11 +60,11 @@ build() { package_eudev() { provides=("udev=${_udev_ver}") - depends=("libeudev" 'kbd' 'kmod' 'hwids' 'util-linux-nosystemd') - optdepends=('eudev-systemd: makes packages compiled with systemd features run' - 'udev-openrc: udev starup scripts for openrc') + depends=("libeudev" 'kbd' 'kmod' 'hwids' 'util-linux') + optdepends=('eudev-openrc: udev starup scripts for openrc') backup=('etc/udev/udev.conf') + cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -71,15 +75,15 @@ package_eudev() { install -Dm644 "${srcdir}/initcpio_hooks" "${pkgdir}/usr/lib/initcpio/hooks/udev" install -Dm644 "${srcdir}/initcpio_install" "${pkgdir}/usr/lib/initcpio/install/udev" - install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook" + + # pacman hooks + install -Dm755 ${srcdir}/udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook + install -Dm644 -t "$pkgdir"/usr/share/libalpm/hooks ${srcdir}/*.hook } package_libeudev() { pkgdesc="eudev client libraries" -# groups=('base-devel') depends=('glibc' 'libelf') - optdepends=('libeudev-systemd: systemd client libraries') - conflicts=('libudev.so') provides=("libudev=${_udev_ver}" 'libudev.so') cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/pcr/eudev/udev-hook b/pcr/eudev/udev-hook new file mode 100644 index 000000000..d9c793f45 --- /dev/null +++ b/pcr/eudev/udev-hook @@ -0,0 +1,16 @@ +#!/bin/sh -e + +udevd_live() { + if [ ! -d /run/udev ]; then + echo >&2 " Skipped: Device manager is not running." + exit 0 + fi +} + +case $1 in + hwdb) /usr/bin/udevadm hwdb --update ;; + udev-reload) udevd_live; /usr/bin/udevadm control --reload ;; + *) echo >&2 " Invalid operation '$1'"; exit 1 ;; +esac + +exit 0 diff --git a/pcr/eudev/udev-hwdb.hook b/pcr/eudev/udev-hwdb.hook index 12f3e58cc..eb17c9ff2 100644 --- a/pcr/eudev/udev-hwdb.hook +++ b/pcr/eudev/udev-hwdb.hook @@ -4,9 +4,8 @@ Operation = Install Operation = Upgrade Operation = Remove Target = usr/lib/udev/hwdb.d/* -Target = etc/udev/hwdb.d/* [Action] Description = Updating udev Hardware Database... When = PostTransaction -Exec = /usr/bin/udevadm hwdb --update +Exec = /usr/share/libalpm/scripts/udev-hook hwdb diff --git a/pcr/eudev/udev-reload.hook b/pcr/eudev/udev-reload.hook new file mode 100644 index 000000000..418515daf --- /dev/null +++ b/pcr/eudev/udev-reload.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/udev/rules.d/* + +[Action] +Description = Reloading device manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/udev-hook udev-reload diff --git a/pcr/gksu/PKGBUILD b/pcr/gksu/PKGBUILD index 880857ac9..e047bc7f7 100644 --- a/pcr/gksu/PKGBUILD +++ b/pcr/gksu/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gksu pkgver=2.0.2 -pkgrel=6.parabola1 +pkgrel=6.parabola2 pkgdesc="A graphical frontend for su" arch=('x86_64' 'i686') url="http://www.nongnu.org/gksu/index.html" diff --git a/pcr/libgksu/PKGBUILD b/pcr/libgksu/PKGBUILD index 15f33828f..de1c919a4 100644 --- a/pcr/libgksu/PKGBUILD +++ b/pcr/libgksu/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libgksu pkgver=2.0.12 -pkgrel=8.parabola1 +pkgrel=8.parabola2 pkgdesc="gksu authorization library" arch=(x86_64 i686) url="http://www.nongnu.org/gksu/index.html" |