diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-11 23:12:58 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-11 23:12:58 +0000 |
| commit | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (patch) | |
| tree | afaa891d69789d31246d52c3d9c47c236929d3c2 /core/mdadm | |
| parent | 1a1b748f1738b1989a834d75b1623be21bf9bab5 (diff) | |
Mon Jul 11 23:12:58 UTC 2011
Diffstat (limited to 'core/mdadm')
| -rw-r--r-- | core/mdadm/PKGBUILD | 27 | ||||
| -rw-r--r-- | core/mdadm/disable-werror.patch | 11 | ||||
| -rwxr-xr-x | core/mdadm/mdadm_hook | 4 | ||||
| -rw-r--r-- | core/mdadm/mdadm_install | 4 |
4 files changed, 26 insertions, 20 deletions
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 0455dce6e..0f9d96fc8 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120375 2011-04-23 07:42:14Z tpowa $ +# $Id: PKGBUILD 129978 2011-06-30 18:05:23Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm -pkgver=3.2.1 -pkgrel=3 +pkgver=3.2.2 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" groups=('base') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') depends=('glibc') backup=('etc/mdadm.conf') source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 @@ -17,13 +17,19 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.conf mdadm_install mdadm_hook - segfault-3.2.1.patch) + disable-werror.patch) install=mdadm.install replaces=('raidtools') +md5sums=('12ee2fbf3beddb60601fb7a4c4905651' + '6df172c8f77b280018cf87eb3d313f29' + '00cbed931db4f15b6ce49e3e7d433966' + '4bb000166fb13e82ceaa2422fdfaac7e' + '36f7cc564ed3267888d90208e0eb7adc' + '4ad87b74a4bc9a34621280abe0e0c3e4') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../segfault-3.2.1.patch + patch -Np0 -i ../disable-werror.patch make CXFLAGS="$CFLAGS" } @@ -36,13 +42,4 @@ package() { install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm # symlink for backward compatibility ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid - # build static mdassemble for Arch's initramfs - make MDASSEMBLE_AUTO=1 mdassemble - install -D -m755 mdassemble $pkgdir/sbin/mdassemble } -md5sums=('d1e2549202bd79d9e99f1498d1109530' - '6df172c8f77b280018cf87eb3d313f29' - '00cbed931db4f15b6ce49e3e7d433966' - '865c3d39e5f5dae58388160b563981f1' - '1a3eb63832cecd6550f5b0a21d58cfdb' - '2fd25605bd1836a33c689ac442cb73ed') diff --git a/core/mdadm/disable-werror.patch b/core/mdadm/disable-werror.patch new file mode 100644 index 000000000..50a33f19d --- /dev/null +++ b/core/mdadm/disable-werror.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2011-06-17 09:38:03.269238332 +0200 ++++ Makefile 2011-06-17 09:38:14.122398837 +0200 +@@ -42,7 +42,7 @@ + + CC = $(CROSS_COMPILE)gcc + CXFLAGS = -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + endif diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 57799d3b8..1d217a5a8 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -39,6 +39,4 @@ run_hook () esac done fi - # assemble everything - [ -e $mdconfig ] && /sbin/mdassemble -}
\ No newline at end of file +} diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index b7a57ea4e..f351cb292 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -1,6 +1,6 @@ # vim: set ft=sh: -install () +build() { MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " BINARIES="" @@ -11,7 +11,7 @@ install () echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdassemble" + add_binary "/sbin/mdadm" add_file "/lib/udev/rules.d/64-md-raid.rules" } |