diff options
| author | James Meyer <james.meyer@operamail.com> | 2014-02-16 23:58:04 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2014-02-19 19:03:04 (GMT) |
| commit | 782a0571b32b84b46cac58f2561ac8ab4672decc (patch) | |
| tree | f7f0626741a51524e528b1187440492104d297d8 /abs/core/pcmciautils | |
| parent | d992bf484dfa07050c368c30a8c2dda70511c066 (diff) | |
| download | linhes_pkgbuild-782a0571b32b84b46cac58f2561ac8ab4672decc.zip linhes_pkgbuild-782a0571b32b84b46cac58f2561ac8ab4672decc.tar.gz linhes_pkgbuild-782a0571b32b84b46cac58f2561ac8ab4672decc.tar.bz2 | |
pciutils pcmciautils:
update binary path to /usr/bin
refs #961
Diffstat (limited to 'abs/core/pcmciautils')
| -rw-r--r-- | abs/core/pcmciautils/PKGBUILD | 26 | ||||
| -rw-r--r-- | abs/core/pcmciautils/initcpio-install-pcmcia | 8 |
2 files changed, 16 insertions, 18 deletions
diff --git a/abs/core/pcmciautils/PKGBUILD b/abs/core/pcmciautils/PKGBUILD index fcc5996..7e3dbab 100644 --- a/abs/core/pcmciautils/PKGBUILD +++ b/abs/core/pcmciautils/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 155725 2012-04-06 00:03:55Z tomegun $ +# $Id: PKGBUILD 185562 2013-05-15 07:34:58Z tpowa $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=pcmciautils pkgver=018 -pkgrel=4 +pkgrel=7 pkgdesc="Utilities for inserting and removing PCMCIA cards" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license=('GPL') groups=('base') -# sysfsutils will not be required in the next release -depends=('udev' 'sysfsutils') +depends=('systemd') conflicts=('pcmcia-cs') # source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz - initcpio-install-pcmcia) +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + initcpio-install-pcmcia) options=(!makeflags) build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's,/usr/bin/install,install,g; - s,/lib/udev,/usr/lib/udev,g' Makefile + cd "$pkgname-$pkgver" + sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile + sed -i -e 's,/sbin,/usr/bin,g' Makefile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install # install the mkinitpcio hook - install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia + install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia" } md5sums=('964c802994677a71b38ec56554aa229f' - '2659576a4637c58c4e79a96f8e43e316') + '041af04025daee5b3b05812ac3896c8f') diff --git a/abs/core/pcmciautils/initcpio-install-pcmcia b/abs/core/pcmciautils/initcpio-install-pcmcia index 71052d6..af89c4c 100644 --- a/abs/core/pcmciautils/initcpio-install-pcmcia +++ b/abs/core/pcmciautils/initcpio-install-pcmcia @@ -1,14 +1,14 @@ #!/bin/bash build() { - FILES="/etc/pcmcia/config.opts" - MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" - - [[ $MODULES ]] && MODULES+=" sd_mod?" + if add_checked_modules -f 'sound|net' '/drivers/pcmcia/'; then + add_module 'sd_mod?' + fi add_binary "/usr/lib/udev/pcmcia-socket-startup" add_binary "/usr/lib/udev/pcmcia-check-broken-cis" add_file "/usr/lib/udev/rules.d/60-pcmcia.rules" + add_file "/etc/pcmcia/config.opts" } help() { |