Merge: Convert package to non-git

4 files changed, 51 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe072abf776e..44159fcf2f0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,23 @@
 # Generated by mksrcinfo v8
-# Wed Apr 20 06:24:36 UTC 2016
-pkgbase = zfs-git
+# Thu Apr 21 08:44:29 UTC 2016
+pkgbase = zfs-linux
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 0.6.5.6_r0_g21f21fe_4.5.1_1
+	pkgver = 0.6.5.6_4.5.1_1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	install = zfs.install
-	arch = i686
 	arch = x86_64
-	groups = archzfs-git
+	groups = archzfs-linux
 	license = CDDL
-	makedepends = git
-	makedepends = linux-headers=4.5.1-1
-	depends = spl-git
-	depends = zfs-utils-git
-	depends = linux=4.5.1-1
-	provides = zfs
-	conflicts = zfs
-	conflicts = zfs-lts
-	replaces = zfs
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=21f21fe8
-	md5sums = SKIP
-
-pkgname = zfs-git
+	depends = kmod
+	depends = spl-linux
+	depends = zfs-utils-linux
+	depends = linux>=4.5.1
+	depends = linux<4.6
+	depends = linux-headers>=4.5.1
+	depends = linux-headers<4.6
+	provides = zfs-linux
+	source = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.5.6.tar.gz
+	sha256sums = c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff
 
+pkgname = zfs-linux
diff --git a/.gitignore b/.gitignore
index de967fb8c0a5..1df2e29bbe7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-zfs/
-*.tar.gz
 *.tar.xz
+*.tar.gz
 *.sig
 *.log
diff --git a/PKGBUILD b/PKGBUILD
index 5ee8666e8d68..ab3caaf661e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,51 @@
 # Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
-# Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>
 #
 # This PKGBUILD was generated by the archzfs build scripts located at
 #
-# http://github.com/demizer/archzfs
+# http://github.com/archzfs/archzfs
 #
-# The build script generates and updates the pkgver and _kernel* variables.
+# ! WARNING !
 #
-pkgname="zfs-git"
-pkgver=0.6.5.6_r0_g21f21fe_4.5.1_1
+# The archzfs packages are kernel modules, so these PKGBUILDS will only work with the kernel package they target. In this
+# case, the archzfs-linux packages will only work with the default package! To have a single PKGBUILD target many kernels
+# would make for a cluttered PKGBUILD!
+#
+# If you have a custom kernel, you will need to change things in the PKGBUILDS. If you would like to have AUR or archzfs repo
+# packages for your favorite kernel package built using the archzfs build tools, submit a request in the Issue tracker on the
+# archzfs github page.
+#
+pkgname="zfs-linux"
+pkgver=0.6.5.6_4.5.1_1
 pkgrel=1
-license=('CDDL')
-
-# Used incase the i686 and x86_64 linux packages get out of sync with the
-# PKGREL. This occurred on January 31, 2014 where i686 was versioned at
-# 3.12.9-1 and x86_64 was versioned at 3.12.9-2.
-_kernel_version_x32="4.5.1-1"
-_kernel_version_x32_full="4.5.1-1"
-_kernel_version_x64="4.5.1-1"
-_kernel_version_x64_full="4.5.1-1"
-
-if [[ $CARCH == "i686" ]]; then
-    _kernel_version=${_kernel_version_x32}
-    _kernel_version_full=${_kernel_version_x32_full}
-else
-    _kernel_version=${_kernel_version_x64}
-    _kernel_version_full=${_kernel_version_x64_full}
-fi
-
 pkgdesc="Kernel modules for the Zettabyte File System."
-depends=("spl-git" "zfs-utils-git" "linux=${_kernel_version}")
-makedepends=("git" "linux-headers=${_kernel_version}")
-arch=("i686" "x86_64")
+depends=("kmod" "spl-linux" "zfs-utils-linux"
+         "linux>=4.5.1" "linux<4.6"
+         "linux-headers>=4.5.1" "linux-headers<4.6")
+arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=21f21fe8")
-groups=("archzfs-git")
-md5sums=('SKIP')
-replaces=("zfs")
-provides=("zfs")
-conflicts=("zfs" "zfs-lts")
+source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.5.6.tar.gz")
+sha256sums=("c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff")
+groups=("archzfs-linux")
+license=("CDDL")
 install=zfs.install
+provides=("zfs-linux")
+
 
 build() {
-    cd "${srcdir}/zfs"
+    cd "${srcdir}/zfs-0.6.5.6"
     ./autogen.sh
-
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --sbindir=/usr/bin \
-                --libdir=/usr/lib \
-                --datadir=/usr/share \
-                --includedir=/usr/include \
-                --with-udevdir=/lib/udev \
-                --libexecdir=/usr/lib/zfs \
-                --with-config=kernel \
-                --with-linux=/usr/lib/modules/${_kernel_version_full}-ARCH/build
-
+    ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
+                --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \
+                --libexecdir=/usr/lib/zfs-0.6.5.6 --with-config=kernel \
+                --with-linux=/usr/lib/modules/4.5.1-1-ARCH/build
     make
 }
 
 package() {
-    cd "${srcdir}/zfs"
+    cd "${srcdir}/zfs-0.6.5.6"
     make DESTDIR="${pkgdir}" install
-
-    cp -r "$pkgdir"/{lib,usr}
-    rm -r "$pkgdir"/lib
-
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/${_kernel_version_full}-ARCH/Module.symvers
+    cp -r "${pkgdir}"/{lib,usr}
+    rm -r "${pkgdir}"/lib
+    # Remove reference to ${srcdir}
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.5.1-1-ARCH/Module.symvers
 }
diff --git a/zfs.install b/zfs.install
index 85dd9a54111c..814ff307eb10 100644
--- a/zfs.install
+++ b/zfs.install
@@ -11,17 +11,10 @@ post_upgrade() {
 }
 
 check_initramfs() {
-    echo ">>> Updating module dependencies. Please wait ..."
-
-    _kernel_version_x32_full="4.5.1-1"
-    _kernel_version_x64_full="4.5.1-1"
-
-    [[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full}
-
-    depmod ${_kernel_version_full}-ARCH
-
+    echo ">>> Updating ZFS module dependencies"
+    depmod 4.5.1-1-ARCH
     MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
-    if [[ $MK_CONF == '0' ]]; then
+    if [[ ${MK_CONF} == '0' ]]; then
         if [[ $1 == 'remove' ]]; then
             echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'
             echo '>>> list in mkinitcpio.conf! You will need to remove "zfs" from the '