diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-14 13:11:29 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-14 13:11:29 +0200 |
| commit | 1d953269cf1d33902f0a61e4cb50ed8ed2895874 (patch) | |
| tree | 5738504fa3ad42138b46f2906cf8a40b5f78afb9 /core/btrfs-progs | |
| parent | 8e5c27c1b5d01d353df2542166d50f9f456b2597 (diff) | |
| parent | caa3e47071c8516ac31afaa0b654f5aaa4911939 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/php-apc/PKGBUILD
testing/glibmm/PKGBUILD
testing/gtkmm3/PKGBUILD
testing/udisks2/PKGBUILD
Diffstat (limited to 'core/btrfs-progs')
| -rw-r--r-- | core/btrfs-progs/PKGBUILD | 24 | ||||
| -rw-r--r-- | core/btrfs-progs/initcpio-hook-btrfs | 7 | ||||
| -rw-r--r-- | core/btrfs-progs/initcpio-install-btrfs | 15 |
3 files changed, 39 insertions, 7 deletions
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index ab848570a..435623e3f 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,31 +1,41 @@ -# $Id: PKGBUILD 147160 2012-01-23 15:27:41Z ibiru $ +# $Id: PKGBUILD 156058 2012-04-12 15:42:01Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs -pkgver=0.19.20120110 +pkgver=0.19.20120328 pkgrel=2 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64 mips64el) depends=('glibc' 'e2fsprogs') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) 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' + 'bdaaf6bd339220c63260acec809864d2' + 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { - cd $srcdir/$pkgname - make CFLAGS="$CFLAGS" all convert + cd $srcdir/$pkgname-$pkgver + make CFLAGS="$CFLAGS" } package() { - cd $srcdir/$pkgname + 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" } -md5sums=('a3f6fbeb166f8e6b5c06833888d4ecf2') diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs new file mode 100644 index 000000000..7965d0a8a --- /dev/null +++ b/core/btrfs-progs/initcpio-hook-btrfs @@ -0,0 +1,7 @@ +#!/usr/bin/ash + +run_hook() { + btrfs device scan +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs new file mode 100644 index 000000000..dbeb47ee8 --- /dev/null +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -0,0 +1,15 @@ +#!/bin/bash + +build() { + MODULES=$(all_modules btrfs) + BINARIES=btrfs + SCRIPT=btrfs +} + +help() { + cat <<HELPEOF +This hook provides support for multi-device btrfs volumes. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: |