diff options
| -rw-r--r-- | abs/core/pciutils/PKGBUILD | 16 | ||||
| -rw-r--r-- | abs/core/pcmciautils/PKGBUILD | 26 | ||||
| -rw-r--r-- | abs/core/pcmciautils/initcpio-install-pcmcia | 8 |
3 files changed, 24 insertions, 26 deletions
diff --git a/abs/core/pciutils/PKGBUILD b/abs/core/pciutils/PKGBUILD index 3046289..ffd8a22 100644 --- a/abs/core/pciutils/PKGBUILD +++ b/abs/core/pciutils/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $ +# $Id: PKGBUILD 197782 2013-10-30 07:26:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils -pkgver=3.1.10 -pkgrel=1 +pkgver=3.2.0 +pkgrel=4 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64) license=('GPL2') groups=('base') url="http://mj.ucw.cz/sw/pciutils/" -depends=('glibc' 'hwids') +depends=('glibc' 'hwids' 'kmod') source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) -md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean - make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" # this is now supplied by the hwids package rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} } +md5sums=('3fccb0b28879adb57d8156115f8003c8') 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() { |