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

[Tom Gundersen]

    Date: Wednesday, November 2, 2011 @ 08:41:54
  Author: tomegun
Revision: 141708

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

Added:
  btrfs-progs-unstable/repos/testing-i686/
  btrfs-progs-unstable/repos/testing-i686/PKGBUILD
    (from rev 141707, btrfs-progs-unstable/trunk/PKGBUILD)
  btrfs-progs-unstable/repos/testing-i686/btrfs-progs-build-fixes.patch
    (from rev 141707, btrfs-progs-unstable/trunk/btrfs-progs-build-fixes.patch)
  btrfs-progs-unstable/repos/testing-x86_64/
  btrfs-progs-unstable/repos/testing-x86_64/PKGBUILD
    (from rev 141707, btrfs-progs-unstable/trunk/PKGBUILD)
  btrfs-progs-unstable/repos/testing-x86_64/btrfs-progs-build-fixes.patch
    (from rev 141707, btrfs-progs-unstable/trunk/btrfs-progs-build-fixes.patch)

----------------------------------------------+
 testing-i686/PKGBUILD                        |   25 +++++++++++++++++++
 testing-i686/btrfs-progs-build-fixes.patch   |   32 +++++++++++++++++++++++++
 testing-x86_64/PKGBUILD                      |   25 +++++++++++++++++++
 testing-x86_64/btrfs-progs-build-fixes.patch |   32 +++++++++++++++++++++++++
 4 files changed, 114 insertions(+)

Copied: btrfs-progs-unstable/repos/testing-i686/PKGBUILD (from rev 141707, btrfs-progs-unstable/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2011-11-02 12:41:54 UTC (rev 141708)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=btrfs-progs-unstable
+pkgver=0.19.20101006
+pkgrel=2
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2)
+url="http://btrfs.wiki.kernel.org/"
+license=('GPL2')
+
+build() {
+   cd $srcdir/$pkgname
+   make CFLAGS="$CFLAGS" all convert
+}
+
+package() {
+   cd $srcdir/$pkgname
+   make prefix=$pkgdir/usr bindir=$pkgdir/sbin install
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+}
+md5sums=('6bce610ed1720e6b9dc9fa96cbd8b73e')

Copied: btrfs-progs-unstable/repos/testing-i686/btrfs-progs-build-fixes.patch (from rev 141707, btrfs-progs-unstable/trunk/btrfs-progs-build-fixes.patch)
===================================================================
--- testing-i686/btrfs-progs-build-fixes.patch	                        (rev 0)
+++ testing-i686/btrfs-progs-build-fixes.patch	2011-11-02 12:41:54 UTC (rev 141708)
@@ -0,0 +1,32 @@
+--- 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);

Copied: btrfs-progs-unstable/repos/testing-x86_64/PKGBUILD (from rev 141707, btrfs-progs-unstable/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2011-11-02 12:41:54 UTC (rev 141708)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=btrfs-progs-unstable
+pkgver=0.19.20101006
+pkgrel=2
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2)
+url="http://btrfs.wiki.kernel.org/"
+license=('GPL2')
+
+build() {
+   cd $srcdir/$pkgname
+   make CFLAGS="$CFLAGS" all convert
+}
+
+package() {
+   cd $srcdir/$pkgname
+   make prefix=$pkgdir/usr bindir=$pkgdir/sbin install
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+}
+md5sums=('6bce610ed1720e6b9dc9fa96cbd8b73e')

Copied: btrfs-progs-unstable/repos/testing-x86_64/btrfs-progs-build-fixes.patch (from rev 141707, btrfs-progs-unstable/trunk/btrfs-progs-build-fixes.patch)
===================================================================
--- testing-x86_64/btrfs-progs-build-fixes.patch	                        (rev 0)
+++ testing-x86_64/btrfs-progs-build-fixes.patch	2011-11-02 12:41:54 UTC (rev 141708)
@@ -0,0 +1,32 @@
+--- 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);