diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-09 09:29:16 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-09 09:29:16 -0300 |
| commit | bf27698570c0232bdabb1f9d4636e13829648264 (patch) | |
| tree | c5f6187b28bd8e011583c4d24979054af2136839 /core/mdadm/PKGBUILD | |
| parent | 8b82a3250aa4e181b97e7faeb055a00e718bdadb (diff) | |
| parent | 2b6f5a28e2e55b46c1169228e1e56f3b18dd08b5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/open-vm-tools-modules/PKGBUILD
community/virtualbox/PKGBUILD
core/lilo/PKGBUILD
core/lilo/lilo.conf
core/pam/PKGBUILD
core/syslinux/PKGBUILD
core/syslinux/syslinux.cfg
extra/ethtool/PKGBUILD
extra/libksba/PKGBUILD
extra/lirc/PKGBUILD
Diffstat (limited to 'core/mdadm/PKGBUILD')
| -rw-r--r-- | core/mdadm/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 581422507..6bd73e08b 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129978 2011-06-30 18:05:23Z thomas $ +# $Id: PKGBUILD 134363 2011-08-03 06:56:40Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -17,7 +17,8 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.conf mdadm_install mdadm_hook - disable-werror.patch) + disable-werror.patch + linux-3.0.patch) install=mdadm.install replaces=('raidtools') md5sums=('12ee2fbf3beddb60601fb7a4c4905651' @@ -25,12 +26,14 @@ md5sums=('12ee2fbf3beddb60601fb7a4c4905651' '00cbed931db4f15b6ce49e3e7d433966' '4bb000166fb13e82ceaa2422fdfaac7e' '36f7cc564ed3267888d90208e0eb7adc' - '4ad87b74a4bc9a34621280abe0e0c3e4') + '4ad87b74a4bc9a34621280abe0e0c3e4' + 'c499b3edbf2c400c8a1984e18c7ce7fa') build() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch - make CXFLAGS="$CFLAGS" + patch -Np1 -i ../linux-3.0.patch + make CXiFLAGS="$CFLAGS" } package() { |