diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-10 18:30:22 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-10 18:30:22 +0100 |
commit | 422ddbe135468a35d04170922ea3d25d18246aca (patch) | |
tree | 39b4d1c3999a4d3a24331974af195f58ede88e29 /core | |
parent | 9c9dcb7ee95f321e5a4243792500f059231722cb (diff) | |
parent | 4aef0a374e20e36cf2bf6e779d93789d9a5791ae (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chicken/PKGBUILD
community/sqliteman/PKGBUILD
extra/exo/PKGBUILD
extra/pyqt/PKGBUILD
extra/sip/PKGBUILD
extra/tumbler/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r-- | core/libssh2/PKGBUILD | 8 | ||||
-rw-r--r-- | core/pcmciautils/PKGBUILD | 21 | ||||
-rw-r--r-- | core/pcmciautils/initcpio-install-pcmcia | 8 |
3 files changed, 18 insertions, 19 deletions
diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD index 5b9c65afe..4df093749 100644 --- a/core/libssh2/PKGBUILD +++ b/core/libssh2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159788 2012-05-27 02:25:20Z dreisner $ +# $Id: PKGBUILD 173038 2012-12-09 15:23:11Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ # Contributor: ice-man <icemanf@gmail.com> pkgname=libssh2 -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" @@ -17,8 +17,8 @@ makedepends=('zlib') provides=('libssh2.so') options=('!libtool') source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) -md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3' - '872cfb1d61dbd5acd0481ab030e8f130') +md5sums=('071004c60c5d6f90354ad1b701013a0b' + 'bd01eca1e58c15233d69dae411dd2656') build() { cd "$pkgname-$pkgver" diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index fcc599665..8cf902069 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155725 2012-04-06 00:03:55Z tomegun $ +# $Id: PKGBUILD 173074 2012-12-10 03:04:40Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@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 @@ groups=('base') 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') diff --git a/core/pcmciautils/initcpio-install-pcmcia b/core/pcmciautils/initcpio-install-pcmcia index 71052d6b2..af89c4c9c 100644 --- a/core/pcmciautils/initcpio-install-pcmcia +++ b/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() { |