From 9c149788e5f610c2f3ec61d9a08a4aabf383db5a Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:39:40 -0600
Subject: btrfs-prog: update to 3.1.2
---
abs/core/btrfs-progs/PKGBUILD | 34 +++++++++++++++++------------
abs/core/btrfs-progs/btrfs-progs.install | 9 ++++++++
abs/core/btrfs-progs/initcpio-install-btrfs | 6 +++--
3 files changed, 33 insertions(+), 16 deletions(-)
create mode 100644 abs/core/btrfs-progs/btrfs-progs.install
diff --git a/abs/core/btrfs-progs/PKGBUILD b/abs/core/btrfs-progs/PKGBUILD
index 8b3f37e..47d6884 100644
--- a/abs/core/btrfs-progs/PKGBUILD
+++ b/abs/core/btrfs-progs/PKGBUILD
@@ -1,37 +1,40 @@
-# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $
+# $Id: PKGBUILD 202441 2013-12-21 23:13:17Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
pkgname=btrfs-progs
-pkgver=0.19.20120328
-pkgrel=3
+pkgver=3.12
+pkgrel=1
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
+depends=('glibc' 'e2fsprogs' 'lzo2')
+makedepends=('git')
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)
-md5sums=('f4504e73cf9254779b78d5b2318ac570'
- '3eae9bf1541e297fa72aa40ebf7320c6'
- 'b09688a915a0ec8f40e2f5aacbabc9ad')
+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)
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname
make CFLAGS="$CFLAGS"
+ make CFLAGS="$CFLAGS" btrfs-select-super
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname
+
make prefix=$pkgdir/usr install
+ install -Dm755 btrfs-select-super $pkgdir/usr/bin
+
# 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
# install mkinitcpio hooks
install -Dm644 "$srcdir/initcpio-install-btrfs" \
@@ -39,3 +42,6 @@ package() {
install -Dm644 "$srcdir/initcpio-hook-btrfs" \
"$pkgdir/usr/lib/initcpio/hooks/btrfs"
}
+md5sums=('SKIP'
+ '7241ba3a4286d08da0d50b7176941112'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad')
diff --git a/abs/core/btrfs-progs/btrfs-progs.install b/abs/core/btrfs-progs/btrfs-progs.install
new file mode 100644
index 0000000..d6c0698
--- /dev/null
+++ b/abs/core/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/abs/core/btrfs-progs/initcpio-install-btrfs b/abs/core/btrfs-progs/initcpio-install-btrfs
index a70a324..f7b0285 100644
--- a/abs/core/btrfs-progs/initcpio-install-btrfs
+++ b/abs/core/btrfs-progs/initcpio-install-btrfs
@@ -1,14 +1,16 @@
#!/bin/bash
build() {
- add_all_modules btrfs
+ add_module btrfs
add_binary btrfs
+ add_binary btrfsck
add_runscript
}
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
}
--
cgit v0.12