Date: Tuesday, February 7, 2012 @ 15:52:22 Author: tomegun Revision: 149448
upgpkg: udev 181-1 rebuild against kmod-5 upstream release ditch blacklists move sbindir + libdir Modified: udev/trunk/PKGBUILD udev/trunk/udev.install --------------+ PKGBUILD | 72 +++++++++++---------------------------------------------- udev.install | 14 ++++++++--- 2 files changed, 25 insertions(+), 61 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-02-07 20:03:23 UTC (rev 149447) +++ PKGBUILD 2012-02-07 20:52:22 UTC (rev 149448) @@ -4,25 +4,27 @@ # Contributor: Tobias Powalowski <[email protected]> # Contributor: Thomas Bächler <[email protected]> -pkgbase="udev" -pkgname=('udev' 'udev-compat') -pkgver=180 +pkgname=udev +pkgver=181 pkgrel=1 +pkgdesc="The userspace dev tools (udev)" +depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils') +install=udev.install arch=(i686 x86_64) +license=('GPL') +makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"; -license=('GPL') +backup=(etc/udev/udev.conf) groups=('base') options=(!makeflags !libtool) -makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz) build() { - cd $srcdir/$pkgbase-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ --with-rootprefix= \ --sysconfdir=/etc \ - --bindir=/sbin \ --libdir=/usr/lib \ --libexecdir=/lib \ --with-systemdsystemunitdir=/lib/systemd/system \ @@ -31,21 +33,10 @@ make } -package_udev() { - pkgdesc="The userspace dev tools (udev)" - depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils') - install=udev.install - backup=(etc/udev/udev.conf) - - cd $srcdir/$pkgbase-$pkgver +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install - # create framebuffer blacklist - install -d -m755 ${pkgdir}/lib/modprobe.d/ - for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do - echo "blacklist $mod" - done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf - # /dev/loop0 is created for convenience, to autoload the module if necessary # this is no longer needed when util-linux-2.21 is released as /dev/loop-control # will be used instead. In that case move this to udev-compat @@ -54,7 +45,7 @@ chgrp disk ${pkgdir}/lib/udev/devices/loop0 # udevd moved, symlink to make life easy for restarting udevd manually - ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd + ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group for i in $pkgdir/lib/udev/rules.d/*.rules; do @@ -63,39 +54,4 @@ s#GROUP="cdrom"#GROUP="optical"#g' $i done } - -package_udev-compat() { - pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" - depends=('udev') - groups=('') - install -d -m755 ${pkgdir}/lib/udev/rules.d - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules - - # create static nodes to be compatible with on-demand module - # loading in the most recent kernel - # - # the list of nodes is generated from /lib/modules/`most recent kernel`/modprobe.devname - # excluding any devices not included in the LTS kernel and any entries in the - # modprobe.devname file of the LTS kernel (if it exists). - - install -d -m755 ${pkgdir}/lib/udev/devices - cd ${pkgdir}/lib/udev/devices - - install -d -m755 net - mknod net/tun c 10 200 - mknod ppp c 108 0 -# mknod loop-control c 10 237 -- does not exist in old kernels - mknod uinput c 10 223 - install -d -m755 mapper - mknod mapper/control c 10 236 - install -d -m755 snd - mknod snd/timer c 116 33 - mknod snd/seq c 116 1 - mknod btrfs-control c 10 234 - mknod autofs c 10 235 - mknod fuse c 10 229 - install -d -m755 cpu - mknod cpu/microcode c 10 184 - -} -md5sums=('1cf124ab5a124ea35d4748ea414926ec') +md5sums=('0d7af750702620a871b9f9b98d8ad859') Modified: udev.install =================================================================== --- udev.install 2012-02-07 20:03:23 UTC (rev 149447) +++ udev.install 2012-02-07 20:52:22 UTC (rev 149448) @@ -2,7 +2,7 @@ # arg 2: the old package version post_upgrade() { - if [ "$(vercmp $2 175)" -lt 0 ]; then + if [ "$(vercmp $2 181)" -lt 0 ]; then echo "ATTENTION UDEV:" echo "----------" if [ "$(vercmp $2 168)" -lt 0 ]; then @@ -58,8 +58,16 @@ echo "where devtmpfs is not mounted by the kernel, this only affects fresh installs." echo " --" fi - echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels" - echo "have this enabled." + if [ "$(vercmp $2 175)" -lt 0 ]; then + echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels" + echo "have this enabled." + echo " --" + fi + echo "udev-compat has been removed, and should be uninstalled." + echo " --" + echo "Framebuffers are no longer blacklisted by default." + echo " --" + echo "binaries moved from /sbin to /usr/bin" echo "---------------" fi }
