[Lunar-commits] <moonbase-core> Merge branch 'dagbrown-btrfs-progs'

[Stefan Wold]

commit b8450e5817f6dbe13847797bc53d781cd99cb0ae
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Thu, 07 Aug 2014 19:28:00 +0200
URL: https://github.com/lunar-linux/moonbase-core/commit/b8450e5817f6dbe13847797bc53d781cd99cb0ae

Merge branch 'dagbrown-btrfs-progs'
---
  filesys/btrfs-progs/BUILD   | +5/-11    
  filesys/btrfs-progs/DETAILS | +4/-4     
  2 files changed, 9 insertions(+), 15 deletions(-)

--- a/filesys/btrfs-progs/BUILD
+++ b/filesys/btrfs-progs/BUILD
@@ -1,11 +1,5 @@
-(
-
-  sedit 's/^prefix.*/prefix = \//' Makefile
-  sedit 's/\/local//' man/Makefile &&
-  sedit 's/^bindir.*/bindir = \/sbin/' Makefile &&
-
-  make &&
-  prepare_install &&
-  make install
-
-) > $C_FIFO 2>&1
+make CFLAGS="$CFLAGS" &&
+make CFLAGS="$CFLAGS" btrfs-select-super &&
+prepare_install &&
+make prefix=/usr bindir=/sbin install &&
+install -Dm0755 btrfs-select-super /sbin
--- a/filesys/btrfs-progs/DETAILS
+++ b/filesys/btrfs-progs/DETAILS
@@ -1,12 +1,12 @@
           MODULE=btrfs-progs
-         VERSION=v0.20-rc1
-          SOURCE=${MODULE}-${VERSION}.tar.bz2
+         VERSION=v3.14.2
+          SOURCE=${MODULE}-${VERSION}.tar.xz
       SOURCE_URL=http://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_VFY=sha1:744d391d7cf7d20cdd2627fb6ef6f43876552751
+      SOURCE_VFY=sha256:70e1d0ca887bfa5062dc74cc5d4556c19adb08453fbfa57edae6802d9c917793
         WEB_SITE=http://btrfs.wiki.kernel.org/index.php/Main_Page
          ENTERED=20090819
-         UPDATED=20090819
+         UPDATED=20140729
            SHORT="btrfs userspace tools"
 
 cat <<EOF