[arch-commits] Commit in pcmciautils/repos (4 files)

[Tom Gundersen]

    Date: Thursday, April 5, 2012 @ 20:03:55
  Author: tomegun
Revision: 155725

db-move: moved pcmciautils from [testing] to [core] (x86_64)

Added:
  pcmciautils/repos/core-x86_64/PKGBUILD
    (from rev 155723, pcmciautils/repos/testing-x86_64/PKGBUILD)
  pcmciautils/repos/core-x86_64/initcpio-install-pcmcia
    (from rev 155723, pcmciautils/repos/testing-x86_64/initcpio-install-pcmcia)
Deleted:
  pcmciautils/repos/core-x86_64/PKGBUILD
  pcmciautils/repos/testing-x86_64/

-------------------------+
 PKGBUILD                |   64 +++++++++++++++++++++++++---------------------
 initcpio-install-pcmcia |   22 +++++++++++++++
 2 files changed, 57 insertions(+), 29 deletions(-)

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-04-06 00:03:54 UTC (rev 155724)
+++ core-x86_64/PKGBUILD	2012-04-06 00:03:55 UTC (rev 155725)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=pcmciautils
-pkgver=018
-pkgrel=2
-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')
-# sysfsutils will not be required in the next release
-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)
-options=(!makeflags)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('964c802994677a71b38ec56554aa229f')

Copied: pcmciautils/repos/core-x86_64/PKGBUILD (from rev 155723, pcmciautils/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-04-06 00:03:55 UTC (rev 155725)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=pcmciautils
+pkgver=018
+pkgrel=4
+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')
+# sysfsutils will not be required in the next release
+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)
+options=(!makeflags)
+
+build() {
+  cd "${srcdir}/${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
+
+  # install the mkinitpcio hook
+  install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia
+}
+md5sums=('964c802994677a71b38ec56554aa229f'
+         '2659576a4637c58c4e79a96f8e43e316')

Copied: pcmciautils/repos/core-x86_64/initcpio-install-pcmcia (from rev 155723, pcmciautils/repos/testing-x86_64/initcpio-install-pcmcia)
===================================================================
--- core-x86_64/initcpio-install-pcmcia	                        (rev 0)
+++ core-x86_64/initcpio-install-pcmcia	2012-04-06 00:03:55 UTC (rev 155725)
@@ -0,0 +1,22 @@
+#!/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?"
+
+    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"
+}
+
+help() {
+    cat <<HELPEOF
+This hook loads the necessary modules for a pcmcia root device.  Detection will
+take place at runtime. To minimize the modules in the image, add the autodetect
+hook too.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et: