Date: Wednesday, August 3, 2011 @ 12:55:02 Author: tomegun Revision: 134400
upgpkg: pcmciautils 018-1 upstream update and remove custom udev rules Modified: pcmciautils/trunk/PKGBUILD Deleted: pcmciautils/trunk/60-pcmcia.rules -----------------+ 60-pcmcia.rules | 30 ------------------------------ PKGBUILD | 17 ++++++----------- 2 files changed, 6 insertions(+), 41 deletions(-) Deleted: 60-pcmcia.rules =================================================================== --- 60-pcmcia.rules 2011-08-03 15:52:24 UTC (rev 134399) +++ 60-pcmcia.rules 2011-08-03 16:55:02 UTC (rev 134400) @@ -1,30 +0,0 @@ -# PCMCIA devices: -# -ACTION!="add", GOTO="pcmciautils_end" -# modprobe $env{MODALIAS} loads all possibly appropriate modules -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ - RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" - -# Very few CIS firmware entries (which we use for matching) -# are so broken that we need to read out random bytes of it -# instead of the manufactor, card or product ID. Then the -# matching is done in userspace. -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ - RUN+="/lib/udev/pcmcia-check-broken-cis" - -# However, the "weak" matching by func_id is only allowed _after_ modprobe -# returns, so that "strong" matches have a higher priority. -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}="1" - -# PCMCIA sockets: -# -# modprobe the pcmcia bus module so that 16-bit PCMCIA devices work -SUBSYSTEM=="pcmcia_socket", \ - RUN+="/lib/udev/load-modules.sh pcmcia" - -# if this is a PCMCIA socket which needs a resource database, -# pcmcia-socket-startup sets it up -SUBSYSTEM=="pcmcia_socket", \ - RUN+="/lib/udev/pcmcia-socket-startup" - -LABEL="pcmciautils_end" Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-03 15:52:24 UTC (rev 134399) +++ PKGBUILD 2011-08-03 16:55:02 UTC (rev 134400) @@ -1,20 +1,18 @@ # $Id$ # Maintainer: Tobias Powalowski <tp...@archlinux.org> pkgname=pcmciautils -pkgver=017 -pkgrel=2 +pkgver=018 +pkgrel=1 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=(i686 x86_64) url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license=('GPL') groups=('base') -depends=('glibc' 'sysfsutils' 'module-init-tools>=3.2pre9') +# sysfsutils will not be required in the next release +depends=('udev' 'sysfsutils') conflicts=('pcmcia-cs') -source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2 - 60-pcmcia.rules) +source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2) options=(!makeflags) -md5sums=('5245af28eeba57ec0606a874d44d10f7' - 'f88ac464ab9c75fe1565af551e6553a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,8 +23,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # fix lspcmcia symlink - ln -sf pccardctl "${pkgdir}"/sbin/lspcmcia - # add fixed rules file - install -D -m644 "${srcdir}"/60-pcmcia.rules "${pkgdir}"/lib/udev/rules.d/ } +md5sums=('5d85669b3440baa4532363da6caaf1b4')