diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template index 18e0f3897d..5b809a7026 100644 --- a/srcpkgs/libgudev/template +++ b/srcpkgs/libgudev/template @@ -1,18 +1,17 @@ # Template file for 'libudev' pkgname=libgudev -version=175 +version=177 wrksrc=udev-${version} distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.xz" build_style=gnu-configure configure_args="--without-selinux --disable-rule-generator --enable-introspection --enable-gudev --disable-static ---disable-hwdb --disable-keymap --disable-mtd_probe" -revision=1 +--disable-keymap --disable-mtd_probe" short_desc="GObject-based wrapper library for libudev" maintainer="Juan RP " homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license="GPL-2" -checksum=6e7c7330a8f7a1d118e33338941381faa005759921caa241535d6930bb12140f +checksum=6f68ef534b1087ba53a3186f6459817e3e197dabbd8fae0b75f8cf9407e04b64 long_desc=" This library makes it much simpler to use libudev from programs already using GObject. It also makes it possible to easily use libudev from other @@ -21,16 +20,20 @@ long_desc=" subpackages="${pkgname}-devel" - Add_dependency build pkg-config Add_dependency build gperf Add_dependency build glib-devel Add_dependency build gobject-introspection +Add_dependency build libblkid-devel +Add_dependency build libkmod-devel +Add_dependency build usbutils +Add_dependency build pciutils post_install() { # remove stuff in udev pkg. for f in etc sbin usr/sbin lib usr/libexec usr/share/man \ - usr/share/pkgconfig usr/share/gtk-doc/html/libudev; do + usr/share/pkgconfig usr/share/gtk-doc/html/libudev \ + usr/bin; do rm -rf ${DESTDIR}/${f} done find ${DESTDIR} -name libudev\* -delete diff --git a/srcpkgs/udev/libudev.template b/srcpkgs/udev/libudev.template index 03bef16889..2cf5c3cd7a 100644 --- a/srcpkgs/udev/libudev.template +++ b/srcpkgs/udev/libudev.template @@ -1,12 +1,10 @@ # Template file for 'libudev'. # -revision=1 short_desc="libudev shared library" long_desc="${long_desc} This library provides access to udev device information." - do_install() { vmove "lib/libudev.so*" lib diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index 204125f798..3acdfc099e 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -1,7 +1,6 @@ # Template file for 'udev' pkgname=udev -version=175 -revision=2 +version=177 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.xz" build_style=gnu-configure configure_args="--sbindir=/sbin --without-selinux --libexecdir=/lib/udev @@ -12,7 +11,7 @@ short_desc="/dev/ and hotplug management daemon" maintainer="Juan RP " homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license="GPL-2" -checksum=6e7c7330a8f7a1d118e33338941381faa005759921caa241535d6930bb12140f +checksum=6f68ef534b1087ba53a3186f6459817e3e197dabbd8fae0b75f8cf9407e04b64 long_desc=" udev is a daemon which dynamically creates and removes device nodes from /dev/, handles hotplug events and loads drivers at boot time." @@ -21,11 +20,13 @@ systemd_services="udev.service on" conf_files="/etc/udev/udev.conf" subpackages="libudev libudev-devel" - Add_dependency build pkg-config Add_dependency build gperf +Add_dependency build libxslt Add_dependency build glib-devel Add_dependency build acl-devel +Add_dependency build libblkid-devel +Add_dependency build libkmod-devel Add_dependency full usbutils ">=0.82" Add_dependency full pciutils @@ -46,4 +47,6 @@ post_install() # udevd has been moved to /lib/udev, make a symlink. vmkdir sbin cd ${DESTDIR}/sbin && ln -sf ../lib/udev/udevd . + # compat symlink to udevadm. + cd ${DESTDIR}/sbin && ln -sf ../usr/bin/udevadm . } diff --git a/srcpkgs/udev/udev.rshlibs b/srcpkgs/udev/udev.rshlibs index 1a9a36618a..a19cdc3ed8 100644 --- a/srcpkgs/udev/udev.rshlibs +++ b/srcpkgs/udev/udev.rshlibs @@ -4,3 +4,5 @@ libm.so.6 libacl.so.1 libglib-2.0.so.0 libpthread.so.0 +libblkid.so.1 +libkmod.so.1