From 785eba71f884dacb6428970385f0867059bebd4e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 24 May 2012 08:08:03 +0200 Subject: [PATCH] udev: use and depend on hwids. --- srcpkgs/udev/libudev-devel.template | 6 ++---- srcpkgs/udev/libudev.template | 3 +-- srcpkgs/udev/template | 16 ++++++++-------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/srcpkgs/udev/libudev-devel.template b/srcpkgs/udev/libudev-devel.template index d4cde4d4d1..5d67bd2f14 100644 --- a/srcpkgs/udev/libudev-devel.template +++ b/srcpkgs/udev/libudev-devel.template @@ -1,15 +1,13 @@ # Template file for 'libudev-devel'. # -depends="glibc-devel libudev" +depends="glibc-devel libudev>=$version" short_desc="libudev development files" long_desc="${long_desc} This package contains the files needed for developing applications that use libudev." - -do_install() -{ +do_install() { vmove usr/include usr vmove usr/share/gtk-doc usr/share vmove usr/lib/pkgconfig/libudev.pc usr/lib/pkgconfig diff --git a/srcpkgs/udev/libudev.template b/srcpkgs/udev/libudev.template index 2cf5c3cd7a..9c0a6eb2d6 100644 --- a/srcpkgs/udev/libudev.template +++ b/srcpkgs/udev/libudev.template @@ -5,8 +5,7 @@ long_desc="${long_desc} This library provides access to udev device information." -do_install() -{ +do_install() { vmove "lib/libudev.so*" lib vmove "usr/lib/libudev.so" usr/lib } diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index ebb83d2c1a..7f59d3c4f3 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -1,15 +1,21 @@ # Template file for 'udev' pkgname=udev version=182 +revision=1 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.xz" build_style=gnu-configure configure_args="--sbindir=/sbin --without-selinux --libexecdir=/lib --with-rootlibdir=/lib --disable-introspection --enable-floppy --with-systemdsystemunitdir=/lib/systemd/system --disable-gudev --disable-static --disable-rule-generator ---with-firmware-path=/lib/firmware/updates:/lib/firmware" +--with-firmware-path=/lib/firmware/updates:/lib/firmware +--with-pci-ids-path=/usr/share/hwdata/pci.ids +--with-usb-ids-path=/usr/share/hwdata/usb.ids" makedepends="pkg-config gperf libxslt libblkid-devel libkmod-devel" -fulldepends="usbutils>=0.82 pciutils" +fulldepends="hwids" +systemd_services="udev.service on" +conf_files="/etc/udev/udev.conf" +subpackages="libudev libudev-devel" short_desc="/dev/ and hotplug management daemon" maintainer="Juan RP " homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -19,12 +25,6 @@ long_desc=" udev is a daemon which dynamically creates and removes device nodes from /dev/, handles hotplug events and loads drivers at boot time." -systemd_services="udev.service on" -conf_files="/etc/udev/udev.conf" -subpackages="libudev libudev-devel" - - - post_install() { # Install the initramfs-tools hook/scripts. vinstall ${FILESDIR}/udev.initramfs-hook 755 \