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

Sébastien Luttringer seblu at archlinux.org
Thu Aug 21 14:50:30 UTC 2014


    Date: Thursday, August 21, 2014 @ 16:50:30
  Author: seblu
Revision: 220501

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

Added:
  btrfs-progs/repos/testing-i686/
  btrfs-progs/repos/testing-i686/01-fix-manpages.patch
    (from rev 220500, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-i686/PKGBUILD
    (from rev 220500, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-i686/btrfs-progs.install
    (from rev 220500, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-i686/initcpio-hook-btrfs
    (from rev 220500, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-i686/initcpio-install-btrfs
    (from rev 220500, btrfs-progs/trunk/initcpio-install-btrfs)
  btrfs-progs/repos/testing-x86_64/
  btrfs-progs/repos/testing-x86_64/01-fix-manpages.patch
    (from rev 220500, btrfs-progs/trunk/01-fix-manpages.patch)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
    (from rev 220500, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
    (from rev 220500, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
    (from rev 220500, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
    (from rev 220500, btrfs-progs/trunk/initcpio-install-btrfs)

---------------------------------------+
 testing-i686/01-fix-manpages.patch    |   13 +++++++
 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/01-fix-manpages.patch  |   13 +++++++
 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, 200 insertions(+)

Copied: btrfs-progs/repos/testing-i686/01-fix-manpages.patch (from rev 220500, btrfs-progs/trunk/01-fix-manpages.patch)
===================================================================
--- testing-i686/01-fix-manpages.patch	                        (rev 0)
+++ testing-i686/01-fix-manpages.patch	2014-08-21 14:50:30 UTC (rev 220501)
@@ -0,0 +1,13 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index e22f5bca0ff2..e3ad34133832 100644
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -74,7 +74,7 @@ install: install-man
+ install-man: man
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+ 	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
++	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
+ 
+ clean:
+ 	$(RM) *.xml *.xml+ *.8 *.8.gz

Copied: btrfs-progs/repos/testing-i686/PKGBUILD (from rev 220500, btrfs-progs/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-08-21 14:50:30 UTC (rev 220501)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=btrfs-progs
+pkgver=3.14.2
+pkgrel=4
+pkgdesc='Btrfs filesystem utilities'
+arch=('i686' 'x86_64')
+depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
+makedepends=('git' 'asciidoc' 'xmlto')
+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#tag=v${pkgver}"
+        'initcpio-install-btrfs'
+        'initcpio-hook-btrfs'
+        '01-fix-manpages.patch')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+         '7241ba3a4286d08da0d50b7176941112'
+         'b09688a915a0ec8f40e2f5aacbabc9ad'
+         'db22d0460539f4696b3d7301dedee17c')
+
+prepare() {
+  patch -p 1 -d $pkgname < 01-fix-manpages.patch
+  # FS#41627
+  cd $pkgname
+  git update-index --assume-unchanged Documentation/Makefile
+}
+
+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
+
+   # install mkinitcpio hooks
+   cd "$srcdir"
+   install -Dm644 initcpio-install-btrfs "$pkgdir/usr/lib/initcpio/install/btrfs"
+   install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-i686/btrfs-progs.install (from rev 220500, btrfs-progs/trunk/btrfs-progs.install)
===================================================================
--- testing-i686/btrfs-progs.install	                        (rev 0)
+++ testing-i686/btrfs-progs.install	2014-08-21 14:50:30 UTC (rev 220501)
@@ -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 220500, btrfs-progs/trunk/initcpio-hook-btrfs)
===================================================================
--- testing-i686/initcpio-hook-btrfs	                        (rev 0)
+++ testing-i686/initcpio-hook-btrfs	2014-08-21 14:50:30 UTC (rev 220501)
@@ -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 220500, btrfs-progs/trunk/initcpio-install-btrfs)
===================================================================
--- testing-i686/initcpio-install-btrfs	                        (rev 0)
+++ testing-i686/initcpio-install-btrfs	2014-08-21 14:50:30 UTC (rev 220501)
@@ -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/01-fix-manpages.patch (from rev 220500, btrfs-progs/trunk/01-fix-manpages.patch)
===================================================================
--- testing-x86_64/01-fix-manpages.patch	                        (rev 0)
+++ testing-x86_64/01-fix-manpages.patch	2014-08-21 14:50:30 UTC (rev 220501)
@@ -0,0 +1,13 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+index e22f5bca0ff2..e3ad34133832 100644
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -74,7 +74,7 @@ install: install-man
+ install-man: man
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+ 	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
+-	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
++	$(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
+ 
+ clean:
+ 	$(RM) *.xml *.xml+ *.8 *.8.gz

Copied: btrfs-progs/repos/testing-x86_64/PKGBUILD (from rev 220500, btrfs-progs/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-08-21 14:50:30 UTC (rev 220501)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=btrfs-progs
+pkgver=3.14.2
+pkgrel=4
+pkgdesc='Btrfs filesystem utilities'
+arch=('i686' 'x86_64')
+depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
+makedepends=('git' 'asciidoc' 'xmlto')
+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#tag=v${pkgver}"
+        'initcpio-install-btrfs'
+        'initcpio-hook-btrfs'
+        '01-fix-manpages.patch')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+         '7241ba3a4286d08da0d50b7176941112'
+         'b09688a915a0ec8f40e2f5aacbabc9ad'
+         'db22d0460539f4696b3d7301dedee17c')
+
+prepare() {
+  patch -p 1 -d $pkgname < 01-fix-manpages.patch
+  # FS#41627
+  cd $pkgname
+  git update-index --assume-unchanged Documentation/Makefile
+}
+
+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
+
+   # install mkinitcpio hooks
+   cd "$srcdir"
+   install -Dm644 initcpio-install-btrfs "$pkgdir/usr/lib/initcpio/install/btrfs"
+   install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-x86_64/btrfs-progs.install (from rev 220500, btrfs-progs/trunk/btrfs-progs.install)
===================================================================
--- testing-x86_64/btrfs-progs.install	                        (rev 0)
+++ testing-x86_64/btrfs-progs.install	2014-08-21 14:50:30 UTC (rev 220501)
@@ -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 220500, btrfs-progs/trunk/initcpio-hook-btrfs)
===================================================================
--- testing-x86_64/initcpio-hook-btrfs	                        (rev 0)
+++ testing-x86_64/initcpio-hook-btrfs	2014-08-21 14:50:30 UTC (rev 220501)
@@ -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 220500, btrfs-progs/trunk/initcpio-install-btrfs)
===================================================================
--- testing-x86_64/initcpio-install-btrfs	                        (rev 0)
+++ testing-x86_64/initcpio-install-btrfs	2014-08-21 14:50:30 UTC (rev 220501)
@@ -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