summaryrefslogtreecommitdiff
path: root/testing/btrfs-progs
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-10-22 01:08:23 -0700
committerroot <root@rshg054.dnsready.net>2012-10-22 01:08:23 -0700
commit99746708edfd2c56f2ba654a14f27e98b1601a43 (patch)
treec54c0eba66ad0190e1be5b54fbdb73b875936943 /testing/btrfs-progs
parent80b6d46a5c9da3f9d0db207d9d0adc265899a915 (diff)
Mon Oct 22 01:08:14 PDT 2012
Diffstat (limited to 'testing/btrfs-progs')
-rw-r--r--testing/btrfs-progs/PKGBUILD14
-rw-r--r--testing/btrfs-progs/btrfs-progs.install9
-rw-r--r--testing/btrfs-progs/initcpio-hook-btrfs5
-rw-r--r--testing/btrfs-progs/initcpio-install-btrfs3
4 files changed, 19 insertions, 12 deletions
diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
index 045e5e038..ee0a1bf57 100644
--- a/testing/btrfs-progs/PKGBUILD
+++ b/testing/btrfs-progs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167942 2012-10-03 23:03:54Z tomegun $
+# $Id: PKGBUILD 169471 2012-10-21 19:56:53Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=btrfs-progs
-pkgver=0.19.20120904
-pkgrel=6
+pkgver=0.19.20121005
+pkgrel=2
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
depends=('glibc' 'e2fsprogs')
@@ -16,7 +16,10 @@ license=('GPL2')
source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
initcpio-install-btrfs
initcpio-hook-btrfs)
-install=btrfs.install
+install=btrfs-progs.install
+md5sums=('7fb014324954ee073b039dc0066de960'
+ 'd7ad825b0b25f2be73289a20e7afcdb7'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -38,6 +41,3 @@ package() {
mkdir -p ${pkgdir}/sbin
ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
}
-md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
- '2d3df276f80bb09813f56a56d6f93ddd'
- '9fb35142755b477a96cb7292f3d64839')
diff --git a/testing/btrfs-progs/btrfs-progs.install b/testing/btrfs-progs/btrfs-progs.install
new file mode 100644
index 000000000..d6c0698a0
--- /dev/null
+++ b/testing/btrfs-progs/btrfs-progs.install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+ if [ "$(vercmp 0.19.20121005 "$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-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs
index 913cec528..7965d0a8a 100644
--- a/testing/btrfs-progs/initcpio-hook-btrfs
+++ b/testing/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/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs
index fb64f12e2..aa06e55ac 100644
--- a/testing/btrfs-progs/initcpio-install-btrfs
+++ b/testing/btrfs-progs/initcpio-install-btrfs
@@ -8,7 +8,8 @@ build() {
help() {
cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes, in the absence of udev.
+This hook provides support for multi-device btrfs volumes. This hook
+is only needed for initramfs images which do not use udev.
HELPEOF
}