diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-04 01:23:34 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-04 01:23:34 -0700 |
| commit | c3ff6b4da8966c22dcbf0f5d8a957b875242789f (patch) | |
| tree | 73064dc985b6d59695639dfb6d4ae4ba99395cc5 /testing/btrfs-progs | |
| parent | 1350233b6dc1924ba29a42462447995f26dae0dc (diff) | |
Thu Oct 4 01:23:34 PDT 2012
Diffstat (limited to 'testing/btrfs-progs')
| -rw-r--r-- | testing/btrfs-progs/PKGBUILD | 28 | ||||
| -rw-r--r-- | testing/btrfs-progs/btrfs.install | 9 | ||||
| -rw-r--r-- | testing/btrfs-progs/initcpio-install-btrfs | 4 |
3 files changed, 22 insertions, 19 deletions
diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD index f40858d29..045e5e038 100644 --- a/testing/btrfs-progs/PKGBUILD +++ b/testing/btrfs-progs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166671 2012-09-15 09:38:19Z tomegun $ +# $Id: PKGBUILD 167942 2012-10-03 23:03:54Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs pkgver=0.19.20120904 -pkgrel=4 +pkgrel=6 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -14,13 +14,19 @@ conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz - 70-btrfs.rules - initcpio-install-btrfs - initcpio-hook-btrfs) + initcpio-install-btrfs + initcpio-hook-btrfs) +install=btrfs.install build() { cd $srcdir/$pkgname-$pkgver make CFLAGS="$CFLAGS" + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" } package() { @@ -31,17 +37,7 @@ package() { mv $pkgdir/usr/man $pkgdir/usr/share/man mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs - - # add udev rule - install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" - - # install mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-btrfs" \ - "$pkgdir/usr/lib/initcpio/install/btrfs" - install -Dm644 "$srcdir/initcpio-hook-btrfs" \ - "$pkgdir/usr/lib/initcpio/hooks/btrfs" } md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2' - '345c62c8b267082361729ca5b647518f' - 'e5186ec3fe8a809b7473470128d1c4ab' + '2d3df276f80bb09813f56a56d6f93ddd' '9fb35142755b477a96cb7292f3d64839') diff --git a/testing/btrfs-progs/btrfs.install b/testing/btrfs-progs/btrfs.install new file mode 100644 index 000000000..077d7529a --- /dev/null +++ b/testing/btrfs-progs/btrfs.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then + echo "btrfs multi-device support now relies on linux 3.6 or later" + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs index aad263378..fb64f12e2 100644 --- a/testing/btrfs-progs/initcpio-install-btrfs +++ b/testing/btrfs-progs/initcpio-install-btrfs @@ -4,13 +4,11 @@ build() { add_module btrfs add_binary btrfs add_runscript - - add_file /usr/lib/udev/rules.d/70-btrfs.rules } help() { cat <<HELPEOF -This hook provides support for multi-device btrfs volumes. +This hook provides support for multi-device btrfs volumes, in the absence of udev. HELPEOF } |