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

Tobias Powalowski tpowa at nymeria.archlinux.org
Mon Oct 28 11:57:48 UTC 2013


    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,
+ 	if (restore)
+ 		fs_info->on_restoring = 1;
+ 
+-	ret = btrfs_scan_fs_devices(fp, path, &fs_devices);
++	ret = btrfs_scan_fs_devices(fp, path, &fs_devices, sb_bytenr);
+ 	if (ret)
+ 		goto out;
+ 
+diff --git a/disk-io.h b/disk-io.h
+index effaa9f..bc749c3 100644
+--- a/disk-io.h
++++ b/disk-io.h
+@@ -59,7 +59,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info,
+ void btrfs_release_all_roots(struct btrfs_fs_info *fs_info);
+ 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);
+ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info);
+ 
+ struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes);

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 197685, btrfs-progs/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2013-10-28 11:57:48 UTC (rev 197686)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=btrfs-progs
+pkgver=0.20rc1.3
+pkgrel=2
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+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=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
+	initcpio-install-btrfs
+	initcpio-hook-btrfs
+	Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch)
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+         '7241ba3a4286d08da0d50b7176941112'
+         'b09688a915a0ec8f40e2f5aacbabc9ad'
+         '1ef602823a7a09f98cd713f52aa33f20')
+
+prepare() {
+   cd $pkgname
+   patch -Np1 -i $srcdir/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.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
+
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+
+   # 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"
+}

Copied: btrfs-progs/repos/testing-i686/btrfs-progs.install (from rev 197685, btrfs-progs/trunk/btrfs-progs.install)
===================================================================
--- testing-i686/btrfs-progs.install	                        (rev 0)
+++ testing-i686/btrfs-progs.install	2013-10-28 11:57:48 UTC (rev 197686)
@@ -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:

Copied: btrfs-progs/repos/testing-i686/initcpio-hook-btrfs (from rev 197685, btrfs-progs/trunk/initcpio-hook-btrfs)
===================================================================
--- testing-i686/initcpio-hook-btrfs	                        (rev 0)
+++ testing-i686/initcpio-hook-btrfs	2013-10-28 11:57:48 UTC (rev 197686)
@@ -0,0 +1,7 @@
+#!/usr/bin/ash
+
+run_hook() {
+    btrfs device scan
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: btrfs-progs/repos/testing-i686/initcpio-install-btrfs (from rev 197685, btrfs-progs/trunk/initcpio-install-btrfs)
===================================================================
--- testing-i686/initcpio-install-btrfs	                        (rev 0)
+++ testing-i686/initcpio-install-btrfs	2013-10-28 11:57:48 UTC (rev 197686)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+build() {
+    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
+is only needed for initramfs images which do not use udev.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: 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)
===================================================================
--- testing-x86_64/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch	                        (rev 0)
+++ testing-x86_64/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,
+ 	if (restore)
+ 		fs_info->on_restoring = 1;
+ 
+-	ret = btrfs_scan_fs_devices(fp, path, &fs_devices);
++	ret = btrfs_scan_fs_devices(fp, path, &fs_devices, sb_bytenr);
+ 	if (ret)
+ 		goto out;
+ 
+diff --git a/disk-io.h b/disk-io.h
+index effaa9f..bc749c3 100644
+--- a/disk-io.h
++++ b/disk-io.h
+@@ -59,7 +59,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info,
+ void btrfs_release_all_roots(struct btrfs_fs_info *fs_info);
+ 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);
+ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info);
+ 
+ struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, int writes);

Copied: btrfs-progs/repos/testing-x86_64/PKGBUILD (from rev 197685, btrfs-progs/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2013-10-28 11:57:48 UTC (rev 197686)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=btrfs-progs
+pkgver=0.20rc1.3
+pkgrel=2
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+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=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
+	initcpio-install-btrfs
+	initcpio-hook-btrfs
+	Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.patch)
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+         '7241ba3a4286d08da0d50b7176941112'
+         'b09688a915a0ec8f40e2f5aacbabc9ad'
+         '1ef602823a7a09f98cd713f52aa33f20')
+
+prepare() {
+   cd $pkgname
+   patch -Np1 -i $srcdir/Btrfs-progs-fix-wrong-arg-sb_bytenr-for-btrfs_scan_fs_devices.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
+
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+
+   # 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"
+}

Copied: btrfs-progs/repos/testing-x86_64/btrfs-progs.install (from rev 197685, btrfs-progs/trunk/btrfs-progs.install)
===================================================================
--- testing-x86_64/btrfs-progs.install	                        (rev 0)
+++ testing-x86_64/btrfs-progs.install	2013-10-28 11:57:48 UTC (rev 197686)
@@ -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:

Copied: btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs (from rev 197685, btrfs-progs/trunk/initcpio-hook-btrfs)
===================================================================
--- testing-x86_64/initcpio-hook-btrfs	                        (rev 0)
+++ testing-x86_64/initcpio-hook-btrfs	2013-10-28 11:57:48 UTC (rev 197686)
@@ -0,0 +1,7 @@
+#!/usr/bin/ash
+
+run_hook() {
+    btrfs device scan
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Copied: btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs (from rev 197685, btrfs-progs/trunk/initcpio-install-btrfs)
===================================================================
--- testing-x86_64/initcpio-install-btrfs	                        (rev 0)
+++ testing-x86_64/initcpio-install-btrfs	2013-10-28 11:57:48 UTC (rev 197686)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+build() {
+    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
+is only needed for initramfs images which do not use udev.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:




More information about the arch-commits mailing list