Merge branch '0.6.0_rc14_3.8.X'

Conflicts:
	devsrc/spl-utils/PKGBUILD
	devsrc/spl/PKGBUILD
	devsrc/zfs-utils/PKGBUILD
	devsrc/zfs/PKGBUILD

devsrc to 0.6.0_rc14_3.8.3
pull/7/head
Jesus Alvarez 12 years ago
commit ce14ab839c
  1. 8
      devsrc/spl-utils/PKGBUILD
  2. 8
      devsrc/spl/PKGBUILD
  3. 8
      devsrc/zfs-utils/PKGBUILD
  4. 8
      devsrc/zfs/PKGBUILD

@ -2,11 +2,11 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk> # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('spl-utils') pkgname=('spl-utils')
pkgver=0.6.0_rc14_3.7.10 pkgver=0.6.0_rc14_3.8.3
pkgrel=3 pkgrel=1
pkgdesc='Solaris Porting Layer kernel module support files.' pkgdesc='Solaris Porting Layer kernel module support files.'
depends=('linux=3.7.10') depends=('linux=3.8.3')
makedepends=('linux-headers=3.7.10') makedepends=('linux-headers=3.8.3')
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://zfsonlinux.org/' url='http://zfsonlinux.org/'
source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz

@ -2,11 +2,11 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk> # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('spl') pkgname=('spl')
pkgver=0.6.0_rc14_3.7.10 pkgver=0.6.0_rc14_3.8.3
pkgrel=3 pkgrel=1
pkgdesc='Solaris Porting Layer kernel modules.' pkgdesc='Solaris Porting Layer kernel modules.'
depends=('spl-utils=0.6.0_rc14_3.7.10' 'linux=3.7.10') depends=('spl-utils=0.6.0_rc14_3.8.3' 'linux=3.8.3')
makedepends=('linux-headers=3.7.10') makedepends=('linux-headers=3.8.3')
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://zfsonlinux.org/' url='http://zfsonlinux.org/'
source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz) source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz)

@ -2,11 +2,11 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk> # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('zfs-utils') pkgname=('zfs-utils')
pkgver=0.6.0_rc14_3.7.10 pkgver=0.6.0_rc14_3.8.3
pkgrel=3 pkgrel=1
pkgdesc="Kernel module support files for the Zettabyte File System." pkgdesc="Kernel module support files for the Zettabyte File System."
depends=('spl=0.6.0_rc14_3.7.10' 'linux=3.7.10') depends=('spl=0.6.0_rc14_3.8.3' 'linux=3.8.3')
makedepends=('linux-headers=3.7.10') makedepends=('linux-headers=3.8.3')
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://zfsonlinux.org/' url='http://zfsonlinux.org/'
source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz

@ -2,11 +2,11 @@
# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk> # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
pkgname=('zfs') pkgname=('zfs')
pkgver=0.6.0_rc14_3.7.10 pkgver=0.6.0_rc14_3.8.3
pkgrel=3 pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System." pkgdesc="Kernel modules for the Zettabyte File System."
depends=('spl=0.6.0_rc14_3.7.10' 'zfs-utils=0.6.0_rc14_3.7.10' 'linux=3.7.10') depends=('spl=0.6.0_rc14_3.8.3' 'zfs-utils=0.6.0_rc14_3.8.3' 'linux=3.8.3')
makedepends=('linux-headers=3.7.10') makedepends=('linux-headers=3.8.3')
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://zfsonlinux.org/' url='http://zfsonlinux.org/'
source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz) source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz)

Loading…
Cancel
Save