diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
| commit | d53c17bfc7766efa4bcb43eecc2906938d3d2ee9 (patch) | |
| tree | 8f29b8f00ba7758d04e66c3b3ab2bbe71363bceb /core/btrfs-progs | |
| parent | 23c40f4e35b9164f83c5bcf376056bca0546f69e (diff) | |
| parent | 26bcb2409416374f6728bd9b863e4fd147adccb3 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/freewrl/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/gource/PKGBUILD
community-testing/gpac/PKGBUILD
community-testing/rss-glx/PKGBUILD
community-testing/smc/PKGBUILD
community/blobby2/PKGBUILD
community/jack2/PKGBUILD
community/kleansweep/PKGBUILD
core/gcc/PKGBUILD
extra/at/PKGBUILD
extra/maxima/PKGBUILD
extra/nicotine/PKGBUILD
extra/python-geoip/PKGBUILD
extra/sqlite/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gst-plugins-base/PKGBUILD
gnome-unstable/gstreamer/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/libtool-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
staging/mesa/PKGBUILD
testing/bzflag/PKGBUILD
testing/cabal-install/PKGBUILD
testing/cairo/PKGBUILD
testing/gcc/PKGBUILD
testing/glew/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libtool/PKGBUILD
testing/mesa/PKGBUILD
testing/nx/PKGBUILD
testing/xf86-video-ati/PKGBUILD
testing/xf86-video-intel/PKGBUILD
testing/xf86-video-intel/xf86-video-intel.install
testing/xf86-video-nouveau/PKGBUILD
testing/xine-lib/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'core/btrfs-progs')
| -rw-r--r-- | core/btrfs-progs/PKGBUILD | 39 | ||||
| -rw-r--r-- | core/btrfs-progs/btrfs-progs.install | 9 |
2 files changed, 29 insertions, 19 deletions
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 766fe7eed..786df5dd1 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 164224 2012-07-27 20:04:40Z dreisner $ +# $Id: PKGBUILD 168061 2012-10-05 15:07:13Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> + pkgname=btrfs-progs -pkgver=0.19.20120328 -pkgrel=4 +pkgver=0.19.20120904 +pkgrel=7 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64 mips64el) depends=('glibc' 'e2fsprogs') @@ -13,17 +14,22 @@ 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') + initcpio-install-btrfs + initcpio-hook-btrfs + 70-btrfs.rules) +#install=btrfs-progs.install build() { cd $srcdir/$pkgname-$pkgver make CFLAGS="$CFLAGS" + + # 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" + install -Dm644 "$srcdir/70-btrfs.rules" \ + "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" } package() { @@ -34,13 +40,8 @@ package() { 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" } +md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2' + 'e5186ec3fe8a809b7473470128d1c4ab' + '9fb35142755b477a96cb7292f3d64839' + '345c62c8b267082361729ca5b647518f') diff --git a/core/btrfs-progs/btrfs-progs.install b/core/btrfs-progs/btrfs-progs.install new file mode 100644 index 000000000..077d7529a --- /dev/null +++ b/core/btrfs-progs/btrfs-progs.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.19.20120904-6 "$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: |