[arch-commits] Commit in pcmciautils/trunk (PKGBUILD initcpio-install-pcmcia)

[Dave Reisner]

    Date: Friday, December 7, 2012 @ 20:12:43
  Author: dreisner
Revision: 172978

upgpkg: pcmciautils 018-5

- fix initcpio install hook for mkinitcpio 0.12.0

Modified:
  pcmciautils/trunk/PKGBUILD
  pcmciautils/trunk/initcpio-install-pcmcia

-------------------------+
 PKGBUILD                |   19 +++++++++----------
 initcpio-install-pcmcia |    8 ++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-08 01:06:51 UTC (rev 172977)
+++ PKGBUILD	2012-12-08 01:12:43 UTC (rev 172978)
@@ -3,9 +3,9 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pcmciautils
 pkgver=018
-pkgrel=4
+pkgrel=5
 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')
@@ -13,23 +13,22 @@
 depends=('udev' 'sysfsutils')
 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)
+md5sums=('964c802994677a71b38ec56554aa229f'
+         '041af04025daee5b3b05812ac3896c8f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   sed -i -e 's,/usr/bin/install,install,g;
              s,/lib/udev,/usr/lib/udev,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')

Modified: initcpio-install-pcmcia
===================================================================
--- initcpio-install-pcmcia	2012-12-08 01:06:51 UTC (rev 172977)
+++ initcpio-install-pcmcia	2012-12-08 01:12:43 UTC (rev 172978)
@@ -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')"
+    if add_checked_modules -f 'sound|net' '/drivers/pcmcia/'; then
+        add_module 'sd_mod?'
+    fi
 
-    [[ $MODULES ]] && MODULES+=" sd_mod?"
-
     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() {