# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1390558154 0
# Node ID d563ba755a6381c3e4c8e8be9ab07bdd9ea3988a
# Parent  a0881230bdd12be5c3493e19b1b0ca22438a48a0
Up: btrfs-progs to 3.12.

diff -r a0881230bdd1 -r d563ba755a63 btrfs-progs/receipt
--- a/btrfs-progs/receipt	Fri Jan 24 14:19:06 2014 +0000
+++ b/btrfs-progs/receipt	Fri Jan 24 10:09:14 2014 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="btrfs-progs"
-VERSION="20120423"
+VERSION="3.12"
 CATEGORY="system-tools"
 SHORT_DESC="Btrfs Filesystem user space tools."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,14 +12,13 @@
 TAGS="filesystem fault-tolerance"
 
 DEPENDS="util-linux-uuid zlib acl"
-BUILD_DEPENDS="e2fsprogs-dev zlib-dev acl-dev git util-linux-uuid-dev"
+BUILD_DEPENDS="util-linux-uuid-dev e2fsprogs e2fsprogs-dev zlib-dev acl-dev git"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	#patch -Np1 -i $stuff/btrfs-progs-build-fixes.patch
-	make all &&
+	make CFLAGS="${CFLAGS}" &&
 	make DESTDIR=$DESTDIR prefix=/usr install
 }
 
@@ -28,7 +27,6 @@
 {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	cp -a $stuff/btrfs-snapshot $fs/usr/bin
 	# Split mkfs --> btrfs-mkfs
 	rm $fs/usr/bin/mkfs.btrfs
 }
diff -r a0881230bdd1 -r d563ba755a63 btrfs-progs/stuff/btrfs-progs-build-fixes.patch
--- a/btrfs-progs/stuff/btrfs-progs-build-fixes.patch	Fri Jan 24 14:19:06 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
---- btrfs-progs-0.19/btrfsck.c	
-+++ btrfs-progs-0.19/btrfsck.c	
-@@ -21,6 +21,9 @@ 
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"
---- btrfs-progs-0.19/mkfs.c	
-+++ btrfs-progs-0.19/mkfs.c	
-@@ -341,7 +341,7 @@ int main(int ac, char **av)
- 	u64 alloc_start = 0;
- 	u64 metadata_profile = BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_DUP;
- 	u64 data_profile = BTRFS_BLOCK_GROUP_RAID0;
--	u32 leafsize = getpagesize();
-+	u32 leafsize = sysconf(_SC_PAGESIZE);
- 	u32 sectorsize = 4096;
- 	u32 nodesize = leafsize;
- 	u32 stripesize = 4096;
-@@ -398,7 +398,7 @@ int main(int ac, char **av)
- 				print_usage();
- 		}
- 	}
--	sectorsize = max(sectorsize, (u32)getpagesize());
-+	sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
- 	if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) {
- 		fprintf(stderr, "Illegal leafsize %u\n", leafsize);
- 		exit(1);
diff -r a0881230bdd1 -r d563ba755a63 btrfs-progs/stuff/btrfs-snapshot
--- a/btrfs-progs/stuff/btrfs-snapshot	Fri Jan 24 14:19:06 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Keep last 30 daily snapshots with crontab
-# Note: do not create 2 snapshots simultaneously (break btrfs mountage)
-#0 * * * * /usr/bin/btrfs-snapshot 5  -hourly
-#1 0 * * * /usr/bin/btrfs-snapshot 30 -daily
-#2 0 1 * * /usr/bin/btrfs-snapshot 12 -monthly
-#3 0 1 1 * /usr/bin/btrfs-snapshot 99 -yearly
-
-btrfs_list()
-{
-	awk '/ btrfs / { if (fs[$1] == "") { fs[$1] = $2; print $2 }}' \
-		< /proc/mounts
-}
-
-which btrfs > /dev/null && for root in $(btrfs_list) ; do
-	dir=${root%/}/.snapshots$2
-	[ -d $dir ] || mkdir $dir
-	cd $dir
-	i=0
-	for s in $(ls -r); do
-		[ $((i++)) -ge ${1:-10} ] && btrfs subvolume delete $s
-	done
-	btrfs subvolume snapshot -r / $(date +%Y%m%d%H%M%S)
-done