[arch-commits] Commit in pcmciautils/repos (10 files)
Dave Reisner
dreisner at archlinux.org
Mon Dec 10 03:04:40 UTC 2012
Date: Sunday, December 9, 2012 @ 22:04:40
Author: dreisner
Revision: 173074
db-move: moved pcmciautils from [testing] to [core] (i686, x86_64)
Added:
pcmciautils/repos/core-i686/PKGBUILD
(from rev 173073, pcmciautils/repos/testing-i686/PKGBUILD)
pcmciautils/repos/core-i686/initcpio-install-pcmcia
(from rev 173073, pcmciautils/repos/testing-i686/initcpio-install-pcmcia)
pcmciautils/repos/core-x86_64/PKGBUILD
(from rev 173073, pcmciautils/repos/testing-x86_64/PKGBUILD)
pcmciautils/repos/core-x86_64/initcpio-install-pcmcia
(from rev 173073, pcmciautils/repos/testing-x86_64/initcpio-install-pcmcia)
Deleted:
pcmciautils/repos/core-i686/PKGBUILD
pcmciautils/repos/core-i686/initcpio-install-pcmcia
pcmciautils/repos/core-x86_64/PKGBUILD
pcmciautils/repos/core-x86_64/initcpio-install-pcmcia
pcmciautils/repos/testing-i686/
pcmciautils/repos/testing-x86_64/
-------------------------------------+
core-i686/PKGBUILD | 69 ++++++++++++++++------------------
core-i686/initcpio-install-pcmcia | 44 ++++++++++-----------
core-x86_64/PKGBUILD | 69 ++++++++++++++++------------------
core-x86_64/initcpio-install-pcmcia | 44 ++++++++++-----------
4 files changed, 112 insertions(+), 114 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-12-10 02:50:34 UTC (rev 173073)
+++ core-i686/PKGBUILD 2012-12-10 03:04:40 UTC (rev 173074)
@@ -1,35 +0,0 @@
-# $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-i686/PKGBUILD (from rev 173073, pcmciautils/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-12-10 03:04:40 UTC (rev 173074)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=pcmciautils
+pkgver=018
+pkgrel=5
+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)
+md5sums=('964c802994677a71b38ec56554aa229f'
+ '041af04025daee5b3b05812ac3896c8f')
+
+build() {
+ cd "$pkgname-$pkgver"
+ sed -i -e 's,/usr/bin/install,install,g;
+ s,/lib/udev,/usr/lib/udev,g' Makefile
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+ # install the mkinitpcio hook
+ install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia"
+}
Deleted: core-i686/initcpio-install-pcmcia
===================================================================
--- core-i686/initcpio-install-pcmcia 2012-12-10 02:50:34 UTC (rev 173073)
+++ core-i686/initcpio-install-pcmcia 2012-12-10 03:04:40 UTC (rev 173074)
@@ -1,22 +0,0 @@
-#!/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:
Copied: pcmciautils/repos/core-i686/initcpio-install-pcmcia (from rev 173073, pcmciautils/repos/testing-i686/initcpio-install-pcmcia)
===================================================================
--- core-i686/initcpio-install-pcmcia (rev 0)
+++ core-i686/initcpio-install-pcmcia 2012-12-10 03:04:40 UTC (rev 173074)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+build() {
+ 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() {
+ 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:
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-12-10 02:50:34 UTC (rev 173073)
+++ core-x86_64/PKGBUILD 2012-12-10 03:04:40 UTC (rev 173074)
@@ -1,35 +0,0 @@
-# $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/PKGBUILD (from rev 173073, pcmciautils/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-12-10 03:04:40 UTC (rev 173074)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=pcmciautils
+pkgver=018
+pkgrel=5
+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)
+md5sums=('964c802994677a71b38ec56554aa229f'
+ '041af04025daee5b3b05812ac3896c8f')
+
+build() {
+ cd "$pkgname-$pkgver"
+ sed -i -e 's,/usr/bin/install,install,g;
+ s,/lib/udev,/usr/lib/udev,g' Makefile
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+
+ # install the mkinitpcio hook
+ install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia"
+}
Deleted: core-x86_64/initcpio-install-pcmcia
===================================================================
--- core-x86_64/initcpio-install-pcmcia 2012-12-10 02:50:34 UTC (rev 173073)
+++ core-x86_64/initcpio-install-pcmcia 2012-12-10 03:04:40 UTC (rev 173074)
@@ -1,22 +0,0 @@
-#!/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:
Copied: pcmciautils/repos/core-x86_64/initcpio-install-pcmcia (from rev 173073, pcmciautils/repos/testing-x86_64/initcpio-install-pcmcia)
===================================================================
--- core-x86_64/initcpio-install-pcmcia (rev 0)
+++ core-x86_64/initcpio-install-pcmcia 2012-12-10 03:04:40 UTC (rev 173074)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+build() {
+ 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() {
+ 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:
More information about the arch-commits
mailing list