[arch-commits] Commit in btrfs-progs/repos (16 files)
Dave Reisner
dreisner at archlinux.org
Fri Jul 27 20:04:41 UTC 2012
Date: Friday, July 27, 2012 @ 16:04:40
Author: dreisner
Revision: 164224
db-move: moved btrfs-progs from [testing] to [core] ( i686, x86_64)
Added:
btrfs-progs/repos/core-i686/70-btrfs.rules
(from rev 164223, btrfs-progs/repos/testing-i686/70-btrfs.rules)
btrfs-progs/repos/core-i686/PKGBUILD
(from rev 164223, btrfs-progs/repos/testing-i686/PKGBUILD)
btrfs-progs/repos/core-i686/initcpio-hook-btrfs
(from rev 164223, btrfs-progs/repos/testing-i686/initcpio-hook-btrfs)
btrfs-progs/repos/core-i686/initcpio-install-btrfs
(from rev 164223, btrfs-progs/repos/testing-i686/initcpio-install-btrfs)
btrfs-progs/repos/core-x86_64/70-btrfs.rules
(from rev 164223, btrfs-progs/repos/testing-x86_64/70-btrfs.rules)
btrfs-progs/repos/core-x86_64/PKGBUILD
(from rev 164223, btrfs-progs/repos/testing-x86_64/PKGBUILD)
btrfs-progs/repos/core-x86_64/initcpio-hook-btrfs
(from rev 164223, btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs)
btrfs-progs/repos/core-x86_64/initcpio-install-btrfs
(from rev 164223, btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs)
Deleted:
btrfs-progs/repos/core-i686/PKGBUILD
btrfs-progs/repos/core-i686/initcpio-hook-btrfs
btrfs-progs/repos/core-i686/initcpio-install-btrfs
btrfs-progs/repos/core-x86_64/PKGBUILD
btrfs-progs/repos/core-x86_64/initcpio-hook-btrfs
btrfs-progs/repos/core-x86_64/initcpio-install-btrfs
btrfs-progs/repos/testing-i686/
btrfs-progs/repos/testing-x86_64/
------------------------------------+
core-i686/70-btrfs.rules | 1
core-i686/PKGBUILD | 87 ++++++++++++++++++-----------------
core-i686/initcpio-hook-btrfs | 17 ++++--
core-i686/initcpio-install-btrfs | 32 ++++++------
core-x86_64/70-btrfs.rules | 1
core-x86_64/PKGBUILD | 87 ++++++++++++++++++-----------------
core-x86_64/initcpio-hook-btrfs | 17 ++++--
core-x86_64/initcpio-install-btrfs | 32 ++++++------
8 files changed, 148 insertions(+), 126 deletions(-)
Copied: btrfs-progs/repos/core-i686/70-btrfs.rules (from rev 164223, btrfs-progs/repos/testing-i686/70-btrfs.rules)
===================================================================
--- core-i686/70-btrfs.rules (rev 0)
+++ core-i686/70-btrfs.rules 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1 @@
+ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k"
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-07-27 19:15:17 UTC (rev 164223)
+++ core-i686/PKGBUILD 2012-07-27 20:04:40 UTC (rev 164224)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=btrfs-progs
-pkgver=0.19.20120328
-pkgrel=3
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-url="http://btrfs.wiki.kernel.org/"
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
- initcpio-install-btrfs
- initcpio-hook-btrfs)
-md5sums=('f4504e73cf9254779b78d5b2318ac570'
- '3eae9bf1541e297fa72aa40ebf7320c6'
- 'b09688a915a0ec8f40e2f5aacbabc9ad')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- make CFLAGS="$CFLAGS"
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr install
- # fix manpage
- mkdir -p $pkgdir/usr/share/
- mv $pkgdir/usr/man $pkgdir/usr/share/man
- mkdir -p ${pkgdir}/sbin
- ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-
- # 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/core-i686/PKGBUILD (from rev 164223, btrfs-progs/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=btrfs-progs
+pkgver=0.19.20120328
+pkgrel=4
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+url="http://btrfs.wiki.kernel.org/"
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+ 70-btrfs.rules
+ initcpio-install-btrfs
+ initcpio-hook-btrfs)
+md5sums=('f4504e73cf9254779b78d5b2318ac570'
+ '345c62c8b267082361729ca5b647518f'
+ 'e5186ec3fe8a809b7473470128d1c4ab'
+ '9fb35142755b477a96cb7292f3d64839')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ make CFLAGS="$CFLAGS"
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr install
+ # fix manpage
+ mkdir -p $pkgdir/usr/share/
+ mv $pkgdir/usr/man $pkgdir/usr/share/man
+ mkdir -p ${pkgdir}/sbin
+ ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+
+ # add udev rule
+ install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
+
+ # 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"
+}
Deleted: core-i686/initcpio-hook-btrfs
===================================================================
--- core-i686/initcpio-hook-btrfs 2012-07-27 19:15:17 UTC (rev 164223)
+++ core-i686/initcpio-hook-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -1,7 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
- btrfs device scan
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: btrfs-progs/repos/core-i686/initcpio-hook-btrfs (from rev 164223, btrfs-progs/repos/testing-i686/initcpio-hook-btrfs)
===================================================================
--- core-i686/initcpio-hook-btrfs (rev 0)
+++ core-i686/initcpio-hook-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1,10 @@
+#!/usr/bin/ash
+
+run_hook() {
+ # if udevd is running, this is done async by add/change events
+ if [ "$udevd_running" -ne 1 ]; then
+ btrfs device scan
+ fi
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: core-i686/initcpio-install-btrfs
===================================================================
--- core-i686/initcpio-install-btrfs 2012-07-27 19:15:17 UTC (rev 164223)
+++ core-i686/initcpio-install-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-build() {
- add_all_modules btrfs
- add_binary btrfs
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: btrfs-progs/repos/core-i686/initcpio-install-btrfs (from rev 164223, btrfs-progs/repos/testing-i686/initcpio-install-btrfs)
===================================================================
--- core-i686/initcpio-install-btrfs (rev 0)
+++ core-i686/initcpio-install-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+build() {
+ add_module btrfs
+ add_binary btrfs
+ add_runscript
+
+ add_file /usr/lib/udev/rules.d/70-btrfs.rules
+}
+
+help() {
+ cat <<HELPEOF
+This hook provides support for multi-device btrfs volumes.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Copied: btrfs-progs/repos/core-x86_64/70-btrfs.rules (from rev 164223, btrfs-progs/repos/testing-x86_64/70-btrfs.rules)
===================================================================
--- core-x86_64/70-btrfs.rules (rev 0)
+++ core-x86_64/70-btrfs.rules 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1 @@
+ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k"
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-07-27 19:15:17 UTC (rev 164223)
+++ core-x86_64/PKGBUILD 2012-07-27 20:04:40 UTC (rev 164224)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-pkgname=btrfs-progs
-pkgver=0.19.20120328
-pkgrel=3
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-url="http://btrfs.wiki.kernel.org/"
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
- initcpio-install-btrfs
- initcpio-hook-btrfs)
-md5sums=('f4504e73cf9254779b78d5b2318ac570'
- '3eae9bf1541e297fa72aa40ebf7320c6'
- 'b09688a915a0ec8f40e2f5aacbabc9ad')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- make CFLAGS="$CFLAGS"
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr install
- # fix manpage
- mkdir -p $pkgdir/usr/share/
- mv $pkgdir/usr/man $pkgdir/usr/share/man
- mkdir -p ${pkgdir}/sbin
- ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-
- # 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/core-x86_64/PKGBUILD (from rev 164223, btrfs-progs/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+pkgname=btrfs-progs
+pkgver=0.19.20120328
+pkgrel=4
+pkgdesc="btrfs filesystem utilities"
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+url="http://btrfs.wiki.kernel.org/"
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+ 70-btrfs.rules
+ initcpio-install-btrfs
+ initcpio-hook-btrfs)
+md5sums=('f4504e73cf9254779b78d5b2318ac570'
+ '345c62c8b267082361729ca5b647518f'
+ 'e5186ec3fe8a809b7473470128d1c4ab'
+ '9fb35142755b477a96cb7292f3d64839')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ make CFLAGS="$CFLAGS"
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr install
+ # fix manpage
+ mkdir -p $pkgdir/usr/share/
+ mv $pkgdir/usr/man $pkgdir/usr/share/man
+ mkdir -p ${pkgdir}/sbin
+ ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+
+ # add udev rule
+ install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
+
+ # 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"
+}
Deleted: core-x86_64/initcpio-hook-btrfs
===================================================================
--- core-x86_64/initcpio-hook-btrfs 2012-07-27 19:15:17 UTC (rev 164223)
+++ core-x86_64/initcpio-hook-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -1,7 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
- btrfs device scan
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: btrfs-progs/repos/core-x86_64/initcpio-hook-btrfs (from rev 164223, btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs)
===================================================================
--- core-x86_64/initcpio-hook-btrfs (rev 0)
+++ core-x86_64/initcpio-hook-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1,10 @@
+#!/usr/bin/ash
+
+run_hook() {
+ # if udevd is running, this is done async by add/change events
+ if [ "$udevd_running" -ne 1 ]; then
+ btrfs device scan
+ fi
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: core-x86_64/initcpio-install-btrfs
===================================================================
--- core-x86_64/initcpio-install-btrfs 2012-07-27 19:15:17 UTC (rev 164223)
+++ core-x86_64/initcpio-install-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-build() {
- add_all_modules btrfs
- add_binary btrfs
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: btrfs-progs/repos/core-x86_64/initcpio-install-btrfs (from rev 164223, btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs)
===================================================================
--- core-x86_64/initcpio-install-btrfs (rev 0)
+++ core-x86_64/initcpio-install-btrfs 2012-07-27 20:04:40 UTC (rev 164224)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+build() {
+ add_module btrfs
+ add_binary btrfs
+ add_runscript
+
+ add_file /usr/lib/udev/rules.d/70-btrfs.rules
+}
+
+help() {
+ cat <<HELPEOF
+This hook provides support for multi-device btrfs volumes.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
More information about the arch-commits
mailing list