[arch-commits] Commit in btrfs-progs/repos (12 files)

2016-04-16 Thread Sébastien Luttringer
Date: Sunday, April 17, 2016 @ 00:05:15
  Author: seblu
Revision: 265072

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  btrfs-progs/repos/testing-i686/PKGBUILD
(from rev 265071, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs-progs.install
(from rev 265071, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-i686/btrfs-scrub@.service
(from rev 265071, btrfs-progs/trunk/btrfs-scrub@.service)
  btrfs-progs/repos/testing-i686/btrfs-scrub@.timer
(from rev 265071, btrfs-progs/trunk/btrfs-scrub@.timer)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
(from rev 265071, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
(from rev 265071, btrfs-progs/trunk/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
(from rev 265071, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
(from rev 265071, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-x86_64/btrfs-scrub@.service
(from rev 265071, btrfs-progs/trunk/btrfs-scrub@.service)
  btrfs-progs/repos/testing-x86_64/btrfs-scrub@.timer
(from rev 265071, btrfs-progs/trunk/btrfs-scrub@.timer)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
(from rev 265071, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
(from rev 265071, btrfs-progs/trunk/initcpio-install-btrfs)

---+
 testing-i686/PKGBUILD |   60 
 testing-i686/btrfs-progs.install  |   15 
 testing-i686/btrfs-scrub@.service |7 +++
 testing-i686/btrfs-scrub@.timer   |   10 +
 testing-i686/initcpio-hook-btrfs  |7 +++
 testing-i686/initcpio-install-btrfs   |   17 +
 testing-x86_64/PKGBUILD   |   60 
 testing-x86_64/btrfs-progs.install|   15 
 testing-x86_64/btrfs-scrub@.service   |7 +++
 testing-x86_64/btrfs-scrub@.timer |   10 +
 testing-x86_64/initcpio-hook-btrfs|7 +++
 testing-x86_64/initcpio-install-btrfs |   17 +
 12 files changed, 232 insertions(+)

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 265071, 
btrfs-progs/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-04-16 22:05:15 UTC (rev 265072)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer 
+# Contributor: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+
+pkgname=btrfs-progs
+pkgver=4.5.1
+pkgrel=1
+pkgdesc='Btrfs filesystem utilities'
+arch=('i686' 'x86_64')
+depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
+makedepends=('git' 'asciidoc' 'xmlto')
+url='http://btrfs.wiki.kernel.org/'
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/kdave/$pkgname.git#tag=v$pkgver"
+'initcpio-install-btrfs'
+'initcpio-hook-btrfs'
+'btrfs-scrub@.service'
+'btrfs-scrub@.timer')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+ '7241ba3a4286d08da0d50b7176941112'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad'
+ '794b867e09451284c545bae112aa0cfd'
+ 'a290e0ab88b7b4675cd20f5a2befc8cb')
+
+build() {
+  cd $pkgname
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname
+ ./btrfs filesystem show
+}
+
+package() {
+  cd $pkgname
+  make prefix="$pkgdir"/usr install
+
+  # install bash completion (FS#44618)
+  install -Dm644 btrfs-completion 
"$pkgdir/usr/share/bash-completion/completions/btrfs"
+
+  # install mkinitcpio hooks
+  cd "$srcdir"
+  install -Dm644 initcpio-install-btrfs 
"$pkgdir/usr/lib/initcpio/install/btrfs"
+  install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+
+  # install scrub service/timer
+  install -Dm644 btrfs-scrub@.service 
"$pkgdir/usr/lib/systemd/system/btrfs-scrub@.service"
+  install -Dm644 btrfs-scrub@.timer 
"$pkgdir/usr/lib/systemd/system/btrfs-scrub@.timer"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-i686/btrfs-progs.install (from rev 265071, 
btrfs-progs/trunk/btrfs-progs.install)
===
--- testing-i686/btrfs-progs.install(rev 0)
+++ testing-i686/btrfs-progs.install2016-04-16 22:05:15 UTC (rev 265072)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  if (( "$(vercmp "$2" 0.19.20121005)" < 0 )); then
+echo 'btrfs multi-device support now relies on linux 3.6 or later'
+  elif (( "$(vercmp "$2" 4.3.1-2)" < 0 )); then
+echo 'btrfs-scrub@.timer instance names

[arch-commits] Commit in btrfs-progs/repos (12 files)

2016-04-16 Thread Sébastien Luttringer
Date: Saturday, April 16, 2016 @ 23:59:23
  Author: seblu
Revision: 265071

archrelease: copy trunk to testing-i686, testing-x86_64

Deleted:
  btrfs-progs/repos/testing-i686/PKGBUILD
  btrfs-progs/repos/testing-i686/btrfs-progs.install
  btrfs-progs/repos/testing-i686/btrfs-scrub@.service
  btrfs-progs/repos/testing-i686/btrfs-scrub@.timer
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
  btrfs-progs/repos/testing-x86_64/PKGBUILD
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
  btrfs-progs/repos/testing-x86_64/btrfs-scrub@.service
  btrfs-progs/repos/testing-x86_64/btrfs-scrub@.timer
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs

---+
 testing-i686/PKGBUILD |   60 
 testing-i686/btrfs-progs.install  |   15 
 testing-i686/btrfs-scrub@.service |7 ---
 testing-i686/btrfs-scrub@.timer   |   10 -
 testing-i686/initcpio-hook-btrfs  |7 ---
 testing-i686/initcpio-install-btrfs   |   17 -
 testing-x86_64/PKGBUILD   |   60 
 testing-x86_64/btrfs-progs.install|   15 
 testing-x86_64/btrfs-scrub@.service   |7 ---
 testing-x86_64/btrfs-scrub@.timer |   10 -
 testing-x86_64/initcpio-hook-btrfs|7 ---
 testing-x86_64/initcpio-install-btrfs |   17 -
 12 files changed, 232 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2016-04-16 21:55:05 UTC (rev 265070)
+++ testing-i686/PKGBUILD   2016-04-16 21:59:23 UTC (rev 265071)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer 
-# Contributor: Tom Gundersen 
-# Contributor: Tobias Powalowski 
-
-pkgname=btrfs-progs
-pkgver=4.5
-pkgrel=1
-pkgdesc='Btrfs filesystem utilities'
-arch=('i686' 'x86_64')
-depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
-makedepends=('git' 'asciidoc' 'xmlto')
-url='http://btrfs.wiki.kernel.org/'
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-source=("git://git.kernel.org/pub/scm/linux/kernel/git/kdave/$pkgname.git#tag=v$pkgver"
-'initcpio-install-btrfs'
-'initcpio-hook-btrfs'
-'btrfs-scrub@.service'
-'btrfs-scrub@.timer')
-install=btrfs-progs.install
-options=(!staticlibs)
-md5sums=('SKIP'
- '7241ba3a4286d08da0d50b7176941112'
- 'b09688a915a0ec8f40e2f5aacbabc9ad'
- '794b867e09451284c545bae112aa0cfd'
- 'a290e0ab88b7b4675cd20f5a2befc8cb')
-
-build() {
-  cd $pkgname
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd $pkgname
- ./btrfs filesystem show
-}
-
-package() {
-  cd $pkgname
-  make prefix="$pkgdir"/usr install
-
-  # install bash completion (FS#44618)
-  install -Dm644 btrfs-completion 
"$pkgdir/usr/share/bash-completion/completions/btrfs"
-
-  # install mkinitcpio hooks
-  cd "$srcdir"
-  install -Dm644 initcpio-install-btrfs 
"$pkgdir/usr/lib/initcpio/install/btrfs"
-  install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
-
-  # install scrub service/timer
-  install -Dm644 btrfs-scrub@.service 
"$pkgdir/usr/lib/systemd/system/btrfs-scrub@.service"
-  install -Dm644 btrfs-scrub@.timer 
"$pkgdir/usr/lib/systemd/system/btrfs-scrub@.timer"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:

Deleted: testing-i686/btrfs-progs.install
===
--- testing-i686/btrfs-progs.install2016-04-16 21:55:05 UTC (rev 265070)
+++ testing-i686/btrfs-progs.install2016-04-16 21:59:23 UTC (rev 265071)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if (( "$(vercmp "$2" 0.19.20121005)" < 0 )); then
-echo 'btrfs multi-device support now relies on linux 3.6 or later'
-  elif (( "$(vercmp "$2" 4.3.1-2)" < 0 )); then
-echo 'btrfs-scrub@.timer instance names must not be prefix by dash anymore'
-echo 'use btrfs-scrub@-.timer to scrub / monthly'
-echo 'btrfs-scrub@home.timer to scrub /home monthly.'
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Deleted: testing-i686/btrfs-scrub@.service
===
--- testing-i686/btrfs-scrub@.service   2016-04-16 21:55:05 UTC (rev 265070)
+++ testing-i686/btrfs-scrub@.service   2016-04-16 21:59:23 UTC (rev 265071)
@@ -1,7 +0,0 @@
-[Unit]
-Description=Btrfs scrub on %f
-
-[Service]
-Nice=19
-IOSchedulingClass=idle
-ExecStart=/usr/bin/btrfs scrub start -B %f

Deleted: testing-i686/btrfs-scrub@.timer
===
--- testing-i686/btrfs-scrub@.timer 2016-04-16 21:55:05 UTC (rev 265070)
+++ testing-i686/btrfs-scrub@.timer 2016-04-16 21:5

[arch-commits] Commit in btrfs-progs/repos (12 files)

2014-09-22 Thread Sébastien Luttringer
Date: Monday, September 22, 2014 @ 20:43:17
  Author: seblu
Revision: 222708

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  btrfs-progs/repos/testing-i686/
  btrfs-progs/repos/testing-i686/01-fix-manpages.patch
(from rev 222707, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-i686/PKGBUILD
(from rev 222707, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs-progs.install
(from rev 222707, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
(from rev 222707, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
(from rev 222707, btrfs-progs/trunk/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/
  btrfs-progs/repos/testing-x86_64/01-fix-manpages.patch
(from rev 222707, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
(from rev 222707, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
(from rev 222707, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
(from rev 222707, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
(from rev 222707, btrfs-progs/trunk/initcpio-install-btrfs)

---+
 testing-i686/01-fix-manpages.patch|   13 +
 testing-i686/PKGBUILD |   45 
 testing-i686/btrfs-progs.install  |9 ++
 testing-i686/initcpio-hook-btrfs  |7 
 testing-i686/initcpio-install-btrfs   |   17 
 testing-x86_64/01-fix-manpages.patch  |   13 +
 testing-x86_64/PKGBUILD   |   45 
 testing-x86_64/btrfs-progs.install|9 ++
 testing-x86_64/initcpio-hook-btrfs|7 
 testing-x86_64/initcpio-install-btrfs |   17 
 10 files changed, 182 insertions(+)

Copied: btrfs-progs/repos/testing-i686/01-fix-manpages.patch (from rev 222707, 
btrfs-progs/trunk/01-fix-manpages.patch)
===
--- testing-i686/01-fix-manpages.patch  (rev 0)
+++ testing-i686/01-fix-manpages.patch  2014-09-22 18:43:17 UTC (rev 222708)
@@ -0,0 +1,13 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index e22f5bca0ff2..e3ad34133832 100644
+--- a/Documentation/Makefile
 b/Documentation/Makefile
+@@ -74,7 +74,7 @@ install: install-man
+ install-man: man
+   $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+   $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-  $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
++  $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
+ 
+ clean:
+   $(RM) *.xml *.xml+ *.8 *.8.gz

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 222707, 
btrfs-progs/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-09-22 18:43:17 UTC (rev 222708)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer 
+# Contributor: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+
+pkgname=btrfs-progs
+pkgver=3.16.1
+pkgrel=1
+pkgdesc='Btrfs filesystem utilities'
+arch=('i686' 'x86_64')
+depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
+makedepends=('git' 'asciidoc' 'xmlto')
+url='http://btrfs.wiki.kernel.org/'
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}"
+'initcpio-install-btrfs'
+'initcpio-hook-btrfs')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+ '7241ba3a4286d08da0d50b7176941112'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad')
+
+build() {
+   cd $pkgname
+   make CFLAGS="$CFLAGS"
+   make CFLAGS="$CFLAGS" btrfs-select-super
+}
+
+package() {
+   cd $pkgname
+
+   make prefix="$pkgdir"/usr install
+   install -Dm755 btrfs-select-super "$pkgdir"/usr/bin
+
+   # install mkinitcpio hooks
+   cd "$srcdir"
+   install -Dm644 initcpio-install-btrfs 
"$pkgdir/usr/lib/initcpio/install/btrfs"
+   install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-i686/btrfs-progs.install (from rev 222707, 
btrfs-progs/trunk/btrfs-progs.install)
===
--- testing-i686/btrfs-progs.install(rev 0)
+++ testing-i686/btrfs-progs.install2014-09-22 18:43:17 UTC (rev 222708)
@@ -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:s

[arch-commits] Commit in btrfs-progs/repos (12 files)

2014-08-21 Thread Sébastien Luttringer
Date: Thursday, August 21, 2014 @ 16:50:30
  Author: seblu
Revision: 220501

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  btrfs-progs/repos/testing-i686/
  btrfs-progs/repos/testing-i686/01-fix-manpages.patch
(from rev 220500, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-i686/PKGBUILD
(from rev 220500, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs-progs.install
(from rev 220500, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
(from rev 220500, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
(from rev 220500, btrfs-progs/trunk/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/
  btrfs-progs/repos/testing-x86_64/01-fix-manpages.patch
(from rev 220500, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
(from rev 220500, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
(from rev 220500, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
(from rev 220500, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
(from rev 220500, btrfs-progs/trunk/initcpio-install-btrfs)

---+
 testing-i686/01-fix-manpages.patch|   13 +++
 testing-i686/PKGBUILD |   54 
 testing-i686/btrfs-progs.install  |9 +
 testing-i686/initcpio-hook-btrfs  |7 
 testing-i686/initcpio-install-btrfs   |   17 ++
 testing-x86_64/01-fix-manpages.patch  |   13 +++
 testing-x86_64/PKGBUILD   |   54 
 testing-x86_64/btrfs-progs.install|9 +
 testing-x86_64/initcpio-hook-btrfs|7 
 testing-x86_64/initcpio-install-btrfs |   17 ++
 10 files changed, 200 insertions(+)

Copied: btrfs-progs/repos/testing-i686/01-fix-manpages.patch (from rev 220500, 
btrfs-progs/trunk/01-fix-manpages.patch)
===
--- testing-i686/01-fix-manpages.patch  (rev 0)
+++ testing-i686/01-fix-manpages.patch  2014-08-21 14:50:30 UTC (rev 220501)
@@ -0,0 +1,13 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index e22f5bca0ff2..e3ad34133832 100644
+--- a/Documentation/Makefile
 b/Documentation/Makefile
+@@ -74,7 +74,7 @@ install: install-man
+ install-man: man
+   $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+   $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-  $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
++  $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
+ 
+ clean:
+   $(RM) *.xml *.xml+ *.8 *.8.gz

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 220500, 
btrfs-progs/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-08-21 14:50:30 UTC (rev 220501)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer 
+# Contributor: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+
+pkgname=btrfs-progs
+pkgver=3.14.2
+pkgrel=4
+pkgdesc='Btrfs filesystem utilities'
+arch=('i686' 'x86_64')
+depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
+makedepends=('git' 'asciidoc' 'xmlto')
+url='http://btrfs.wiki.kernel.org/'
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}"
+'initcpio-install-btrfs'
+'initcpio-hook-btrfs'
+'01-fix-manpages.patch')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+ '7241ba3a4286d08da0d50b7176941112'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad'
+ 'db22d0460539f4696b3d7301dedee17c')
+
+prepare() {
+  patch -p 1 -d $pkgname < 01-fix-manpages.patch
+  # FS#41627
+  cd $pkgname
+  git update-index --assume-unchanged Documentation/Makefile
+}
+
+build() {
+   cd $pkgname
+   make CFLAGS="$CFLAGS"
+   make CFLAGS="$CFLAGS" btrfs-select-super
+}
+
+package() {
+   cd $pkgname
+
+   make prefix="$pkgdir"/usr install
+   install -Dm755 btrfs-select-super "$pkgdir"/usr/bin
+
+   # install mkinitcpio hooks
+   cd "$srcdir"
+   install -Dm644 initcpio-install-btrfs 
"$pkgdir/usr/lib/initcpio/install/btrfs"
+   install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-i686/btrfs-progs.install (from rev 220500, 
btrfs-progs/trunk/btrfs-progs.install)
===
--- testing-i686/btrfs-progs.install(rev 0)
+++ testing-i686/btrfs-progs.install20

[arch-commits] Commit in btrfs-progs/repos (12 files)

2014-07-31 Thread Sébastien Luttringer
Date: Friday, August 1, 2014 @ 02:07:38
  Author: seblu
Revision: 218470

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  btrfs-progs/repos/testing-i686/
  btrfs-progs/repos/testing-i686/01-fix-manpages.patch
(from rev 218469, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-i686/PKGBUILD
(from rev 218469, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs-progs.install
(from rev 218469, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
(from rev 218469, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
(from rev 218469, btrfs-progs/trunk/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/
  btrfs-progs/repos/testing-x86_64/01-fix-manpages.patch
(from rev 218469, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
(from rev 218469, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
(from rev 218469, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
(from rev 218469, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
(from rev 218469, btrfs-progs/trunk/initcpio-install-btrfs)

---+
 testing-i686/01-fix-manpages.patch|   13 
 testing-i686/PKGBUILD |   51 
 testing-i686/btrfs-progs.install  |9 +
 testing-i686/initcpio-hook-btrfs  |7 
 testing-i686/initcpio-install-btrfs   |   17 ++
 testing-x86_64/01-fix-manpages.patch  |   13 
 testing-x86_64/PKGBUILD   |   51 
 testing-x86_64/btrfs-progs.install|9 +
 testing-x86_64/initcpio-hook-btrfs|7 
 testing-x86_64/initcpio-install-btrfs |   17 ++
 10 files changed, 194 insertions(+)

Copied: btrfs-progs/repos/testing-i686/01-fix-manpages.patch (from rev 218469, 
btrfs-progs/trunk/01-fix-manpages.patch)
===
--- testing-i686/01-fix-manpages.patch  (rev 0)
+++ testing-i686/01-fix-manpages.patch  2014-08-01 00:07:38 UTC (rev 218470)
@@ -0,0 +1,13 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index e22f5bca0ff2..e3ad34133832 100644
+--- a/Documentation/Makefile
 b/Documentation/Makefile
+@@ -74,7 +74,7 @@ install: install-man
+ install-man: man
+   $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+   $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-  $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
++  $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
+ 
+ clean:
+   $(RM) *.xml *.xml+ *.8 *.8.gz

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 218469, 
btrfs-progs/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-08-01 00:07:38 UTC (rev 218470)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer 
+# Contributor: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+
+pkgname=btrfs-progs
+pkgver=3.14.2
+pkgrel=3
+pkgdesc='Btrfs filesystem utilities'
+arch=('i686' 'x86_64')
+depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
+makedepends=('git' 'asciidoc' 'xmlto')
+url='http://btrfs.wiki.kernel.org/'
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}"
+'initcpio-install-btrfs'
+'initcpio-hook-btrfs'
+'01-fix-manpages.patch')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+ '7241ba3a4286d08da0d50b7176941112'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad'
+ 'db22d0460539f4696b3d7301dedee17c')
+
+prepare() {
+  patch -p 1 -d $pkgname < 01-fix-manpages.patch
+}
+
+build() {
+   cd $pkgname
+   make CFLAGS="$CFLAGS"
+   make CFLAGS="$CFLAGS" btrfs-select-super
+}
+
+package() {
+   cd $pkgname
+
+   make prefix="$pkgdir"/usr install
+   install -Dm755 btrfs-select-super "$pkgdir"/usr/bin
+
+   # install mkinitcpio hooks
+   cd "$srcdir"
+   install -Dm644 initcpio-install-btrfs 
"$pkgdir/usr/lib/initcpio/install/btrfs"
+   install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-i686/btrfs-progs.install (from rev 218469, 
btrfs-progs/trunk/btrfs-progs.install)
===
--- testing-i686/btrfs-progs.install(rev 0)
+++ testing-i686/btrfs-progs.install2014-08-01 00:07:38 UTC (rev 218470)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+  if [ "$

[arch-commits] Commit in btrfs-progs/repos (12 files)

2013-10-28 Thread Tobias Powalowski
Date: Monday, October 28, 2013 @ 12:57:48
  Author: tpowa
Revision: 197686

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  btrfs-progs/repos/testing-i686/
  
btrfs-progs/repos/testing-i686/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
(from rev 197685, 
btrfs-progs/trunk/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch)
  btrfs-progs/repos/testing-i686/PKGBUILD
(from rev 197685, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs-progs.install
(from rev 197685, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
(from rev 197685, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
(from rev 197685, btrfs-progs/trunk/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/
  
btrfs-progs/repos/testing-x86_64/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
(from rev 197685, 
btrfs-progs/trunk/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
(from rev 197685, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
(from rev 197685, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
(from rev 197685, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
(from rev 197685, btrfs-progs/trunk/initcpio-install-btrfs)

+
 
testing-i686/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
   |   71 ++
 testing-i686/PKGBUILD  
|   54 +++
 testing-i686/btrfs-progs.install   
|9 +
 testing-i686/initcpio-hook-btrfs   
|7 
 testing-i686/initcpio-install-btrfs
|   17 ++
 
testing-x86_64/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
 |   71 ++
 testing-x86_64/PKGBUILD
|   54 +++
 testing-x86_64/btrfs-progs.install 
|9 +
 testing-x86_64/initcpio-hook-btrfs 
|7 
 testing-x86_64/initcpio-install-btrfs  
|   17 ++
 10 files changed, 316 insertions(+)

Copied: 
btrfs-progs/repos/testing-i686/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
 (from rev 197685, 
btrfs-progs/trunk/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch)
===
--- 
testing-i686/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
(rev 0)
+++ 
testing-i686/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch
2013-10-28 11:57:48 UTC (rev 197686)
@@ -0,0 +1,71 @@
+diff --git a/btrfs-find-root.c b/btrfs-find-root.c
+index 9b3d7df..374cf81 100644
+--- a/btrfs-find-root.c
 b/btrfs-find-root.c
+@@ -82,7 +82,7 @@ static struct btrfs_root *open_ctree_broken(int fd, const 
char *device)
+   return NULL;
+   }
+ 
+-  ret = btrfs_scan_fs_devices(fd, device, &fs_devices);
++  ret = btrfs_scan_fs_devices(fd, device, &fs_devices, 0);
+   if (ret)
+   goto out;
+ 
+diff --git a/cmds-chunk.c b/cmds-chunk.c
+index 03314de..6ada328 100644
+--- a/cmds-chunk.c
 b/cmds-chunk.c
+@@ -1291,7 +1291,7 @@ static int recover_prepare(struct recover_control *rc, 
char *path)
+   goto fail_free_sb;
+   }
+ 
+-  ret = btrfs_scan_fs_devices(fd, path, &fs_devices);
++  ret = btrfs_scan_fs_devices(fd, path, &fs_devices, 0);
+   if (ret)
+   goto fail_free_sb;
+ 
+diff --git a/disk-io.c b/disk-io.c
+index 13dbe27..f8e236c 100644
+--- a/disk-io.c
 b/disk-io.c
+@@ -909,13 +909,16 @@ void btrfs_cleanup_all_caches(struct btrfs_fs_info 
*fs_info)
+ }
+ 
+ int btrfs_scan_fs_devices(int fd, const char *path,
+-struct btrfs_fs_devices **fs_devices)
++struct btrfs_fs_devices **fs_devices,
++u64 sb_bytenr)
+ {
+   u64 total_devs;
+   int ret;
++  if (!sb_bytenr)
++  sb_bytenr = BTRFS_SUPER_INFO_OFFSET;
+ 
+   ret = btrfs_scan_one_device(fd, path, fs_devices,
+-  &total_devs, BTRFS_SUPER_INFO_OFFSET);
++  &total_devs, sb_bytenr);
+   if (ret) {
+   fprintf(stderr, "No valid Btrfs found on %s\n", path);
+   return ret;
+@@ -1001,7 +1004,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, 
const char *path,
+  

[arch-commits] Commit in btrfs-progs/repos (12 files)

2012-10-05 Thread Tom Gundersen
Date: Friday, October 5, 2012 @ 06:14:22
  Author: tomegun
Revision: 168017

db-move: moved btrfs-progs from [core] to [testing] (i686, x86_64)

Added:
  btrfs-progs/repos/testing-i686/
  btrfs-progs/repos/testing-i686/PKGBUILD
(from rev 168016, btrfs-progs/repos/core-i686/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs.install
(from rev 168016, btrfs-progs/repos/core-i686/btrfs.install)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
(from rev 168016, btrfs-progs/repos/core-i686/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
(from rev 168016, btrfs-progs/repos/core-i686/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/
  btrfs-progs/repos/testing-x86_64/PKGBUILD
(from rev 168016, btrfs-progs/repos/core-x86_64/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs.install
(from rev 168016, btrfs-progs/repos/core-x86_64/btrfs.install)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
(from rev 168016, btrfs-progs/repos/core-x86_64/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
(from rev 168016, btrfs-progs/repos/core-x86_64/initcpio-install-btrfs)
Deleted:
  btrfs-progs/repos/core-i686/
  btrfs-progs/repos/core-x86_64/

---+
 testing-i686/PKGBUILD |   43 
 testing-i686/btrfs.install|9 ++
 testing-i686/initcpio-hook-btrfs  |   10 +++
 testing-i686/initcpio-install-btrfs   |   15 +++
 testing-x86_64/PKGBUILD   |   43 
 testing-x86_64/btrfs.install  |9 ++
 testing-x86_64/initcpio-hook-btrfs|   10 +++
 testing-x86_64/initcpio-install-btrfs |   15 +++
 8 files changed, 154 insertions(+)

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 168016, 
btrfs-progs/repos/core-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-05 10:14:22 UTC (rev 168017)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+
+pkgname=btrfs-progs
+pkgver=0.19.20120904
+pkgrel=6
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+url="http://btrfs.wiki.kernel.org/";
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+   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() {
+   cd $srcdir/$pkgname-$pkgver
+   make prefix=$pkgdir/usr install
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+   mkdir -p ${pkgdir}/sbin
+   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+}
+md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
+ '2d3df276f80bb09813f56a56d6f93ddd'
+ '9fb35142755b477a96cb7292f3d64839')

Copied: btrfs-progs/repos/testing-i686/btrfs.install (from rev 168016, 
btrfs-progs/repos/core-i686/btrfs.install)
===
--- testing-i686/btrfs.install  (rev 0)
+++ testing-i686/btrfs.install  2012-10-05 10:14:22 UTC (rev 168017)
@@ -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:

Copied: btrfs-progs/repos/testing-i686/initcpio-hook-btrfs (from rev 168016, 
btrfs-progs/repos/core-i686/initcpio-hook-btrfs)
===
--- testing-i686/initcpio-hook-btrfs(rev 0)
+++ testing-i686/initcpio-hook-btrfs2012-10-05 10:14:22 UTC (rev 168017)
@@ -0,0 +1,10 @@
+#!/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
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: btrfs-progs/repos/testing-i686/initcpio-install-btrfs (from rev 168016, 
btrfs-progs/repos/core-i686/initcpio-install-btrfs)
===
--- testing-i686/initcpio-install-btrfs (rev 0)
+++ testing-i686/initcpio-install-btrfs 2012-10-05 10:14:22 UTC (rev 168017)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+build() {
+add_module btrfs
+add_binary btrfs
+add_runscript
+}
+
+help() {
+cat <
+# Contributor: Tobias Powalowski 
+
+pkgna

[arch-commits] Commit in btrfs-progs/repos (12 files)

2012-10-03 Thread Tom Gundersen
Date: Wednesday, October 3, 2012 @ 19:03:54
  Author: tomegun
Revision: 167942

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  btrfs-progs/repos/testing-i686/PKGBUILD
(from rev 167941, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs.install
(from rev 167941, btrfs-progs/trunk/btrfs.install)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
(from rev 167941, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
(from rev 167941, btrfs-progs/trunk/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
(from rev 167941, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs.install
(from rev 167941, btrfs-progs/trunk/btrfs.install)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
(from rev 167941, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
(from rev 167941, btrfs-progs/trunk/initcpio-install-btrfs)
Deleted:
  btrfs-progs/repos/testing-i686/PKGBUILD
  btrfs-progs/repos/testing-i686/btrfs.install
  btrfs-progs/repos/testing-x86_64/PKGBUILD
  btrfs-progs/repos/testing-x86_64/btrfs.install

---+
 testing-i686/PKGBUILD |   76 ++--
 testing-i686/btrfs.install|   19 +++-
 testing-i686/initcpio-hook-btrfs  |   10 
 testing-i686/initcpio-install-btrfs   |   15 ++
 testing-x86_64/PKGBUILD   |   76 ++--
 testing-x86_64/btrfs.install  |   19 +++-
 testing-x86_64/initcpio-hook-btrfs|   10 
 testing-x86_64/initcpio-install-btrfs |   15 ++
 8 files changed, 154 insertions(+), 86 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-10-03 23:03:17 UTC (rev 167941)
+++ testing-i686/PKGBUILD   2012-10-03 23:03:54 UTC (rev 167942)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor: Tobias Powalowski 
-
-pkgname=btrfs-progs
-pkgver=0.19.20120904
-pkgrel=6
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-url="http://btrfs.wiki.kernel.org/";
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
-install=btrfs.install
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-   make CFLAGS="$CFLAGS"
-}
-
-package() {
-   cd $srcdir/$pkgname-$pkgver
-   make prefix=$pkgdir/usr install
-   # fix manpage
-   mkdir -p $pkgdir/usr/share/
-   mv $pkgdir/usr/man $pkgdir/usr/share/man
-   mkdir -p ${pkgdir}/sbin
-   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-}
-md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2')

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 167941, 
btrfs-progs/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-03 23:03:54 UTC (rev 167942)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+# Contributor: Tobias Powalowski 
+
+pkgname=btrfs-progs
+pkgver=0.19.20120904
+pkgrel=6
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+url="http://btrfs.wiki.kernel.org/";
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+   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() {
+   cd $srcdir/$pkgname-$pkgver
+   make prefix=$pkgdir/usr install
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+   mkdir -p ${pkgdir}/sbin
+   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+}
+md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
+ '2d3df276f80bb09813f56a56d6f93ddd'
+ '9fb35142755b477a96cb7292f3d64839')

Deleted: testing-i686/btrfs.install
===
--- testing-i686/btrfs.install  2012-10-03 23:03:17 UTC (rev 167941)
+++ testing-i686/btrfs.install  2012-10-03 23:03:54 UTC (rev 167942)
@@ -1,10 +0,0 @@
-#!/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"
-echo "the btrfs mkinitcpio hook has now been replaced by the udev hook"
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Copied: btrfs-progs/repos/testing-i686/btrf