From fd3ea04a9bd462c5bbb5e918e7b98fe1a4ceb083 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 13 Jul 2011 14:55:46 +0200 Subject: [PATCH] udev: update to 172. --- srcpkgs/libgudev/libgudev-devel.template | 8 ++--- srcpkgs/udev/libudev-devel.template | 12 ++----- srcpkgs/udev/libudev.template | 7 ++-- srcpkgs/udev/template | 41 +++++++++--------------- 4 files changed, 24 insertions(+), 44 deletions(-) diff --git a/srcpkgs/libgudev/libgudev-devel.template b/srcpkgs/libgudev/libgudev-devel.template index ad450728fc5..61f3c9bc49b 100644 --- a/srcpkgs/libgudev/libgudev-devel.template +++ b/srcpkgs/libgudev/libgudev-devel.template @@ -6,15 +6,13 @@ long_desc="${long_desc} This package contains the libgudev development files (static libs, headers, etc), a library to interact with udev through the GLib bindings." -replaces="udev-glib-devel>=0" Add_dependency run libudev-devel Add_dependency run glib-devel Add_dependency run libgudev do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + vmove usr/include usr + vmove usr/share usr + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/udev/libudev-devel.template b/srcpkgs/udev/libudev-devel.template index 70db1fa6764..54e9f212cfa 100644 --- a/srcpkgs/udev/libudev-devel.template +++ b/srcpkgs/udev/libudev-devel.template @@ -6,18 +6,12 @@ long_desc="${long_desc} This package contains the files needed for developing applications that use libudev." -replaces="udev-devel>=0" Add_dependency run glibc-devel Add_dependency run libudev do_install() { - mkdir -p ${DESTDIR}/usr/lib/pkgconfig \ - ${DESTDIR}/usr/include ${DESTDIR}/lib \ - ${DESTDIR}/usr/share/gtk-doc/html - mv ${SRCPKGDESTDIR}/usr/include/libudev* ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc/html/libudev \ - ${DESTDIR}/usr/share/gtk-doc/html - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/libudev* \ - ${DESTDIR}/usr/lib/pkgconfig + 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 b7d7938899a..605941bf9de 100644 --- a/srcpkgs/udev/libudev.template +++ b/srcpkgs/udev/libudev.template @@ -5,13 +5,10 @@ long_desc="${long_desc} This library provides access to udev device information." -revision=1 - Add_dependency run glibc do_install() { - mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/lib/libudev*.so* ${DESTDIR}/lib - mv ${SRCPKGDESTDIR}/usr/lib/libudev*.so ${DESTDIR}/usr/lib + vmove "lib/libudev.so*" lib + vmove "usr/lib/libudev.so" usr/lib } diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index 02b2a49004b..853cc281fa3 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -1,18 +1,16 @@ # Template file for 'udev' pkgname=udev -version=171 -revision=2 +version=172 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure configure_args="--sbindir=/sbin --without-selinux --libexecdir=/lib/udev --with-rootlibdir=/lib --disable-introspection --enable-edd --enable-floppy ---enable-action_modeswitch --with-systemdsystemunitdir=/lib/systemd/system ---disable-gudev" +--with-systemdsystemunitdir=/lib/systemd/system --disable-gudev" 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=fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e +checksum=b8959cc951ff69ff13305aad6836eac1ff672d98d5a11435c38c4608f77bbd6a long_desc=" udev is a daemon which dynamically creates and removes device nodes from /dev/, handles hotplug events and loads drivers at boot time." @@ -25,37 +23,30 @@ subpackages="libudev libudev-devel" Add_dependency run glibc Add_dependency run glib Add_dependency run acl -Add_dependency run libusb-compat + +Add_dependency build pkg-config +Add_dependency build gperf +Add_dependency build glib-devel +Add_dependency build acl-devel Add_dependency full usbutils ">=0.82" Add_dependency full pciutils -Add_dependency build pkg-config -Add_dependency build libtool -Add_dependency build gperf -Add_dependency build glib-devel -Add_dependency build acl-devel -Add_dependency build glib-devel -Add_dependency build libusb-compat-devel - post_install() { # Install some additional rules. - install -m644 ${wrksrc}/rules/misc/* ${DESTDIR}/lib/udev/rules.d + install -m644 rules/misc/* ${DESTDIR}/lib/udev/rules.d # Install the OpenRC service - install -D -m755 ${FILESDIR}/udev.rc ${DESTDIR}/etc/init.d/udev + vinstall ${FILESDIR}/udev.rc 755 etc/init.d udev # Install the initramfs-tools hook/scripts. - install -d $DESTDIR/usr/share/initramfs-tools/hooks - install -d $DESTDIR/usr/share/initramfs-tools/scripts/init-top - install -d $DESTDIR/usr/share/initramfs-tools/scripts/init-bottom - install -m 755 ${FILESDIR}/udev.initramfs-hook \ - $DESTDIR/usr/share/initramfs-tools/hooks/udev - install -m 755 ${FILESDIR}/udev.initramfs-inittop \ - $DESTDIR/usr/share/initramfs-tools/scripts/init-top/udev - install -m 755 ${FILESDIR}/udev.initramfs-bottom \ - $DESTDIR/usr/share/initramfs-tools/scripts/init-bottom/udev + vinstall ${FILESDIR}/udev.initramfs-hook 755 \ + usr/share/initramfs-tools/hooks udev + vinstall ${FILESDIR}/udev.initramfs-inittop 755 \ + usr/share/initramfs-tools/scripts/init-top udev + vinstall ${FILESDIR}/udev.initramfs-bottom 755 \ + usr/share/initramfs-tools/scripts/init-bottom udev # Move pkgconfig files to correct path install -d $DESTDIR/usr/lib/pkgconfig