diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-25 01:42:20 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-25 01:42:20 -0700 |
| commit | a3b55a0c47a00ac40bc00a4ce87d93f809273840 (patch) | |
| tree | 6fcc1360f835115b132c35ca978b1f804540a372 /core/btrfs-progs | |
| parent | 120df4e0db159525806a9b33364483e76f9d51d3 (diff) | |
Thu Oct 25 01:42:05 PDT 2012
Diffstat (limited to 'core/btrfs-progs')
| -rw-r--r-- | core/btrfs-progs/PKGBUILD | 20 | ||||
| -rw-r--r-- | core/btrfs-progs/btrfs-progs.install | 2 | ||||
| -rw-r--r-- | core/btrfs-progs/initcpio-hook-btrfs | 5 | ||||
| -rw-r--r-- | core/btrfs-progs/initcpio-install-btrfs | 5 |
4 files changed, 12 insertions, 20 deletions
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 5e690e728..773a11213 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168061 2012-10-05 15:07:13Z tomegun $ +# $Id: PKGBUILD 169609 2012-10-24 12:46:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs -pkgver=0.19.20120904 -pkgrel=7 +pkgver=0.19.20121005 +pkgrel=2 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -15,9 +15,11 @@ provides=('btrfs-progs-unstable') license=('GPL2') source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz initcpio-install-btrfs - initcpio-hook-btrfs - 70-btrfs.rules) -#install=btrfs-progs.install + initcpio-hook-btrfs) +install=btrfs-progs.install +md5sums=('7fb014324954ee073b039dc0066de960' + 'd7ad825b0b25f2be73289a20e7afcdb7' + 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { cd $srcdir/$pkgname-$pkgver @@ -28,8 +30,6 @@ build() { "$pkgdir/usr/lib/initcpio/install/btrfs" install -Dm644 "$srcdir/initcpio-hook-btrfs" \ "$pkgdir/usr/lib/initcpio/hooks/btrfs" - install -Dm644 "$srcdir/70-btrfs.rules" \ - "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" } package() { @@ -41,7 +41,3 @@ package() { mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs } -md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2' - 'e5186ec3fe8a809b7473470128d1c4ab' - '9fb35142755b477a96cb7292f3d64839' - '345c62c8b267082361729ca5b647518f') diff --git a/core/btrfs-progs/btrfs-progs.install b/core/btrfs-progs/btrfs-progs.install index 077d7529a..d6c0698a0 100644 --- a/core/btrfs-progs/btrfs-progs.install +++ b/core/btrfs-progs/btrfs-progs.install @@ -1,7 +1,7 @@ #!/bin/sh post_upgrade() { - if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then + if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then echo "btrfs multi-device support now relies on linux 3.6 or later" fi } diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs index 913cec528..7965d0a8a 100644 --- a/core/btrfs-progs/initcpio-hook-btrfs +++ b/core/btrfs-progs/initcpio-hook-btrfs @@ -1,10 +1,7 @@ #!/usr/bin/ash run_hook() { - # if udevd is running, this is done async by add/change events - if [ "$udevd_running" -ne 1 ]; then - btrfs device scan - fi + btrfs device scan } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs index aad263378..aa06e55ac 100644 --- a/core/btrfs-progs/initcpio-install-btrfs +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -4,13 +4,12 @@ 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. This hook +is only needed for initramfs images which do not use udev. HELPEOF } |