diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
commit | f24ad15758f8eebcc46cb0c210f888491869d3f0 (patch) | |
tree | 85c74dd33e056502de7a306161d28f5b15b274c2 /core/udev | |
parent | 5f4568c7f7ba204bc047d2c74a5721f23024b339 (diff) | |
parent | 636ce8849a9c82c1787c2919ffcfe6685cb799d3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/darkstat/PKGBUILD
community/dbmail/PKGBUILD
community/dvdisaster/PKGBUILD
community/epic4/PKGBUILD
community/fb-client/PKGBUILD
community/fcrackzip/PKGBUILD
community/fdupes/PKGBUILD
community/flobopuyo/PKGBUILD
community/intel-tbb/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/sunpinyin/PKGBUILD
community/tinc/PKGBUILD
community/uudeview/PKGBUILD
community/zathura/PKGBUILD
core/libedit/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/openssl/PKGBUILD
core/util-linux/PKGBUILD
extra/lua/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/openssl/PKGBUILD
testing/sudo/PKGBUILD
testing/udev/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'core/udev')
-rw-r--r-- | core/udev/PKGBUILD | 19 | ||||
-rw-r--r-- | core/udev/udev.install | 100 |
2 files changed, 51 insertions, 68 deletions
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 80bd4b804..7fcfcf217 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150105 2012-02-12 15:37:11Z dreisner $ +# $Id: PKGBUILD 153480 2012-03-14 23:26:14Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,9 +6,9 @@ pkgname=udev pkgver=181 -pkgrel=2 +pkgrel=4 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils') +depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils' 'acl') install=udev.install arch=(i686 x86_64 mips64el) license=('GPL') @@ -39,15 +39,12 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install - # /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. Support for this will go away in a future version of udev - install -d -m755 ${pkgdir}/lib/udev/devices/ - mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0 - chgrp disk ${pkgdir}/lib/udev/devices/loop0 - # udevd moved, symlink to make life easy for restarting udevd manually - ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd + ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd + + # the path to udevadm is hardcoded in some places + install -d ${pkgdir}/sbin + ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group for i in $pkgdir/lib/udev/rules.d/*.rules; do diff --git a/core/udev/udev.install b/core/udev/udev.install index 7c866c2a3..557efe9e1 100644 --- a/core/udev/udev.install +++ b/core/udev/udev.install @@ -2,72 +2,58 @@ # arg 2: the old package version post_upgrade() { - if [ "$(vercmp $2 181)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "----------" + if [ "$(vercmp $2 181-3)" -lt 0 ]; then + echo "udev changes:" if [ "$(vercmp $2 168)" -lt 0 ]; then - echo "Kernel 2.6.32 or newer is now required." - echo " --" - echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo " --" - echo "Arch specific cd symlinks are now no longer created." - echo " --" - echo "cd and net persistent rules will no longer be autogenerated," - echo "see <https://wiki.archlinux.org/index.php/Udev> for details." - echo " --" - echo "Errors are now logged (possibly to the console) by default." - echo " --" + echo " * Kernel 2.6.32 or newer is now required." + echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed." + echo " * Arch specific cd symlinks are now no longer created." + echo " * cd and net persistent rules will no longer be autogenerated," + echo " see <https://wiki.archlinux.org/index.php/Udev> for details." + echo " * Errors are now logged (possibly to the console) by default." fi if [ "$(vercmp $2 171)" -lt 0 ]; then - echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" - echo "blacklisting in MODULES no longer works." - echo "See 'man modprobe.conf' for a replacement to blacklisting." - echo "To disable a module mod1 on the kernel command line, use" - echo "mod1.disable=1" - echo "or" - echo "modprobe.blacklist=mod1" - echo " --" - echo "The following modules are no longer unconditionally loaded:" - echo " pcspkr irtty-sir analog lp ppdev ide-generic" - echo "Add them to MODULES in rc.conf if you need them." - echo " --" + echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" + echo " blacklisting in MODULES no longer works." + echo " See 'man modprobe.conf' for a replacement to blacklisting." + echo " To disable a module mod1 on the kernel command line, use" + echo " mod1.disable=1" + echo " or" + echo " modprobe.blacklist=mod1" + echo " * The following modules are no longer unconditionally loaded:" + echo " pcspkr irtty-sir analog lp ppdev ide-generic" + echo " Add them to MODULES in rc.conf if you need them." fi if [ "$(vercmp $2 172)" -lt 0 ]; then - echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" - echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" - echo "takes precedence." - echo " --" - echo "kbd and rtc devices are no longer world readable." - echo " --" - echo "rtc is no longer in the audio group and fb devices are no longer in" - echo "the video group, as permissions and ownership of fb devices are controlled" - echo "by X." - echo " --" + echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" + echo " /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" + echo " takes precedence." + echo " * kbd and rtc devices are no longer world readable." + echo " * rtc is no longer in the audio group and fb devices are no longer in" + echo " the video group, as permissions and ownership of fb devices are controlled" + echo " by X." fi if [ "$(vercmp $2 174)" -lt 0 ]; then - echo "We now use upstream rules for assigning devices to the 'disk', 'optical'," - echo "'scanner' and 'video' groups. Beware of any changes." - echo " --" - echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0." - echo " --" - echo "For security reasons, we no longer add devices to the 'storage' group. Use" - echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" - echo "this functionality back." - echo " --" - echo "We no longer create the static nodes on install needed for an initrd-less boot" - echo "where devtmpfs is not mounted by the kernel, this only affects fresh installs." - echo " --" + echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo " 'scanner' and 'video' groups. Beware of any changes." + echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." + echo " * For security reasons, we no longer add devices to the 'storage' group. Use" + echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo " this functionality back." + echo " * We no longer create the static nodes on install needed for an initrd-less" + echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" + echo " installs." fi 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 " --" + echo " * devtmpfs support is now a hard requirement. Users of the official Arch" + echo " kernels have this enabled." 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 "---------------" + if [ "$(vercmp $2 181)" -lt 0 ]; then + echo " * udev-compat has been removed, and should be uninstalled." + echo " * Framebuffers are no longer blacklisted by default." + echo " * binaries moved from /sbin to /usr/bin" + fi + echo " * if your kernel does not provide /dev/loop-control, you need to manually" + echo " load the 'loop' module before using losetup" fi } |