From 9d17a8315989dd485005e69b31a32a600689a58a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 23 Apr 2010 11:58:14 +0200 Subject: [PATCH] udev: update to 153, added gir-gudev subpkg. --HG-- extra : convert_revision : a1e24589da779297efcf2cd653eb46a0aa74f9a8 --- srcpkgs/gir-gudev | 1 + srcpkgs/udev/files/udev.initramfs-hook | 3 +-- ...nitramfs-premount => udev.initramfs-inittop} | 13 ++++++++++--- srcpkgs/udev/gir-gudev.template | 17 +++++++++++++++++ srcpkgs/udev/libgudev-devel.template | 2 +- srcpkgs/udev/libudev-devel.template | 1 - srcpkgs/udev/libudev.template | 2 -- srcpkgs/udev/template | 16 ++++++++-------- 8 files changed, 38 insertions(+), 17 deletions(-) create mode 120000 srcpkgs/gir-gudev rename srcpkgs/udev/files/{udev.initramfs-premount => udev.initramfs-inittop} (60%) create mode 100644 srcpkgs/udev/gir-gudev.template diff --git a/srcpkgs/gir-gudev b/srcpkgs/gir-gudev new file mode 120000 index 00000000000..b95ad750c43 --- /dev/null +++ b/srcpkgs/gir-gudev @@ -0,0 +1 @@ +udev \ No newline at end of file diff --git a/srcpkgs/udev/files/udev.initramfs-hook b/srcpkgs/udev/files/udev.initramfs-hook index 8d594b33282..c1fc3fa3662 100644 --- a/srcpkgs/udev/files/udev.initramfs-hook +++ b/srcpkgs/udev/files/udev.initramfs-hook @@ -33,8 +33,7 @@ mkdir -p ${DESTDIR}/lib/udev/rules.d UDEV_RULES=" 50-udev-default.rules 50-firmware.rules 60-persistent-storage.rules -61-persistent-storage-edd.rules 64-device-mapper.rules -64-md-raid.rules 80-drivers.rules 95-udev-late.rules" +61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules" for f in ${UDEV_RULES}; do cp -p /lib/udev/rules.d/$f ${DESTDIR}/lib/udev/rules.d diff --git a/srcpkgs/udev/files/udev.initramfs-premount b/srcpkgs/udev/files/udev.initramfs-inittop similarity index 60% rename from srcpkgs/udev/files/udev.initramfs-premount rename to srcpkgs/udev/files/udev.initramfs-inittop index c413b253bfc..dd3033c887c 100644 --- a/srcpkgs/udev/files/udev.initramfs-premount +++ b/srcpkgs/udev/files/udev.initramfs-inittop @@ -18,12 +18,19 @@ esac # It's all over netlink now -echo "" > /proc/sys/kernel/hotplug +echo > /sys/kernel/uevent_helper # Start the udev daemon to process events -/sbin/udevd --daemon --resolve-names=never +udevd --daemon --resolve-names=never # Iterate sysfs and fire off everything; if we include a rule for it then # it'll get handled; otherwise it'll get handled later when we do this again # in the main boot sequence. -/sbin/udevadm trigger +mkdir -p /dev/.udev/queue/ +udevadm trigger --action=add +udevadm settle || true + +if [ -d /sys/bus/scsi ]; then + modprobe -q scsi_wait_scan && modprobe -r scsi_wait_scan || true + udevadm settle || true +fi diff --git a/srcpkgs/udev/gir-gudev.template b/srcpkgs/udev/gir-gudev.template new file mode 100644 index 00000000000..7a62a04f8e4 --- /dev/null +++ b/srcpkgs/udev/gir-gudev.template @@ -0,0 +1,17 @@ +# Template file for 'gir-gudev'. +# +short_desc="libgudev introspection data" +long_desc="${long_desc} + + This package contains the GObject-introspection data of libgudev in + binary typelib format." + +Add_dependency run gir-freedesktop +Add_dependency run glib +Add_dependency run libgudev + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/udev/libgudev-devel.template b/srcpkgs/udev/libgudev-devel.template index f60920ea6be..f6f3a9300ee 100644 --- a/srcpkgs/udev/libgudev-devel.template +++ b/srcpkgs/udev/libgudev-devel.template @@ -6,7 +6,6 @@ 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." -revision=1 replaces="udev-glib-devel>=0" Add_dependency run libudev-devel Add_dependency run glib-devel @@ -21,4 +20,5 @@ do_install() ${DESTDIR}/usr/share/gtk-doc/html mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/gudev* \ ${DESTDIR}/usr/lib/pkgconfig + mv ${SRCPKGDESTDIR}/usr/share/gir-1.0 ${DESTDIR}/usr/share } diff --git a/srcpkgs/udev/libudev-devel.template b/srcpkgs/udev/libudev-devel.template index 97890774b19..1b062537a39 100644 --- a/srcpkgs/udev/libudev-devel.template +++ b/srcpkgs/udev/libudev-devel.template @@ -6,7 +6,6 @@ long_desc="${long_desc} This package contains the files needed for developing applications that use libudev." -revision=1 replaces="udev-devel>=0" Add_dependency run glibc-devel Add_dependency run libudev diff --git a/srcpkgs/udev/libudev.template b/srcpkgs/udev/libudev.template index 3080f4b045d..f68eca22ac0 100644 --- a/srcpkgs/udev/libudev.template +++ b/srcpkgs/udev/libudev.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This library provides access to udev device information." -revision=1 - Add_dependency run glibc do_install() diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index 4fd69c40e29..8943c0ab40e 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -1,14 +1,13 @@ # Template file for 'udev' pkgname=udev -version=151 -revision=1 +version=153 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure configure_args="--exec-prefix= --without-selinux --libexecdir=/lib/udev - --with-rootlibdir=/lib --disable-introspection" + --with-rootlibdir=/lib --enable-introspection" short_desc="A userspace implementation of devfs" maintainer="Juan RP " -checksum=d37a94e75b962182ce940e4a839f07b1c7024dbe7e4b870a120bf0fe9ed0d55d +checksum=8a0e6b8d12284c03652bcbfa26156308f1ee3288f9a3499088cc2e0731d17644 long_desc=" udev is a implementation of devfs in userspace using sysfs and /sbin/hotplug. It requires a 2.5/2.6 kernel to run properly." @@ -16,7 +15,8 @@ long_desc=" keep_empty_dirs=yes openrc_services="udev sysinit true" conf_files="/etc/udev/udev.conf" -subpackages="libudev libudev-devel libgudev libgudev-devel" +subpackages="gir-gudev libudev libudev-devel libgudev libgudev-devel" +triggers="initramfs-tools" Add_dependency run glibc Add_dependency run acl @@ -47,12 +47,12 @@ post_install() # Install the initramfs-tools hook/scripts. install -d $DESTDIR/usr/share/initramfs-tools/hooks - install -d $DESTDIR/usr/share/initramfs-tools/scripts/init-premount + 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-premount \ - $DESTDIR/usr/share/initramfs-tools/scripts/init-premount/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