Return to hard set linux version

See https://github.com/archzfs/archzfs/issues/28#issuecomment-217774637

Closes #56

build.sh

@@ -216,6 +216,12 @@ generate_package_files() {
     run_cmd_no_output "source ${script_dir}/src/zfs/PKGBUILD.sh"
     msg2 "Creating zfs.install"
     run_cmd_no_output "source ${script_dir}/src/zfs/zfs.install.sh"
+
+    msg "Update diffs ..."
+    run_cmd "cd ${spl_utils_pkgbuild_path} && git --no-pager diff"
+    run_cmd "cd ${spl_pkgbuild_path} && git --no-pager diff"
+    run_cmd "cd ${zfs_utils_pkgbuild_path} && git --no-pager diff"
+    run_cmd "cd ${zfs_pkgbuild_path} && git --no-pager diff"
 }
 
 

lib.sh

@@ -486,6 +486,7 @@ pkgbuild_cleanup() {
     # $1 the file to process
     # Strip all blanklines
     sed -i '/^\s*$/d' $1
+    sed -i 's/"\ )$/")/g' $1
     # Readd blanklines above build and package
     sed -i '/^build\(\)/{x;p;x;}' $1
     sed -i '/^package\(\)/{x;p;x;}' $1

packages/linux-lts/spl-linux-lts

@@ -1 +1 @@
-Subproject commit eb124e822ea760b0e3c277c9b1773bd90ec7fce7
+Subproject commit 35737f378bca2ecb90eeb7cac4fcb79985c8f664

packages/linux-lts/spl-utils-linux-lts

@@ -1 +1 @@
-Subproject commit c7cfeed317fdb90e4088109aa8b0967158284246
+Subproject commit 96f933b01bacc25e7f9037385d88946a05db7cf5

packages/linux-lts/zfs-linux-lts

@@ -1 +1 @@
-Subproject commit ebbd4cde4e3fd61a4c42365b9b8ed6ced59dfb7a
+Subproject commit 0dc102c8a7f1b4288aca09f8aa999dc4ef25790b

packages/linux-lts/zfs-utils-linux-lts

@@ -1 +1 @@
-Subproject commit ccf7258224e2b593136fe11fb8722993c3ab9616
+Subproject commit aee478dfb152fd0310e786bbf3b71ccb864dfaf3

packages/linux/spl-linux

@@ -1 +1 @@
-Subproject commit 2625cce33a83855c5b69073f8b9471e1c12c5629
+Subproject commit 7c19055ea3978ea7faad642b4d8bf485c5f8784a

packages/linux/spl-linux-git

@@ -1 +1 @@
-Subproject commit 34ef28f065228f9a096f74f6a3967bd45f9fe66a
+Subproject commit 7376ba62acc15eb22a7bdbcfe9da3b89e06ee08c

packages/linux/spl-utils-linux

@@ -1 +1 @@
-Subproject commit 91076adb8dc6fd959825dd730c2b3427693ec371
+Subproject commit 0a9d7a76728548dc5aeb619cfa231f1d54e5c927

packages/linux/spl-utils-linux-git

@@ -1 +1 @@
-Subproject commit 8e3665474f1cc46981cdd824fa85e6454bf30b2f
+Subproject commit a4e7f0067912bf7ecbe589ec529a935e7975af65

packages/linux/zfs-linux

@@ -1 +1 @@
-Subproject commit 987e39d8c85bbfce96e03fac01855e162891b8e3
+Subproject commit 053d4ff600dce9d03c1e79eeb103f8a54008f8e9

packages/linux/zfs-linux-git

@@ -1 +1 @@
-Subproject commit 7aba2166f6be6f18bbfdf029fa92051b3be4cb64
+Subproject commit ff4dff201c8f51620f5ae8a7bf5d62f97b6292a0

packages/linux/zfs-utils-linux

@@ -1 +1 @@
-Subproject commit 8dbec42dab2d1916e36e6be9072d713341e6744b
+Subproject commit 001c52d2676a9328758bef8016063922df219cd4

packages/linux/zfs-utils-linux-git

@@ -1 +1 @@
-Subproject commit 1a4a67d625f66f7d420a1951039e43d5c9b0b5e2
+Subproject commit a65f6bec172d2db078015e6fb584b94a80471122

src/kernels/linux-lts.sh

@@ -3,7 +3,7 @@ mode_name="lts"
 mode_desc="Select and use the packages for the linux-lts kernel"
 
 # Kernel versions for LTS packages
-pkgrel="1"
+pkgrel="2"
 kernel_version="4.4.9-1"
 kernel_version_next="4.5"
 
@@ -49,6 +49,6 @@ update_linux_lts_pkgbuilds() {
     zfs_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-${zol_version}.tar.gz"
     spl_workdir="\${srcdir}/spl-${zol_version}"
     zfs_workdir="\${srcdir}/zfs-${zol_version}"
-    linux_depends="\"linux-lts>=${kernel_version_major}\" \"linux-lts<${kernel_version_next}\""
-    linux_headers_depends="\"linux-lts-headers>=${kernel_version_major}\" \"linux-lts-headers<${kernel_version_next}\""
+    linux_depends="\"linux-lts=${kernel_version_major}\""
+    linux_headers_depends="\"linux-lts-headers=${kernel_version_major}\""
 }

src/kernels/linux.sh

@@ -3,8 +3,8 @@ mode_name="std"
 mode_desc="Select and use the packages for the default linux kernel"
 
 # Kernel versions for default ZFS packages
-pkgrel="5"
-kernel_version="4.5.1-1"
+pkgrel="1"
+kernel_version="4.5.2-1"
 kernel_version_next="4.6"
 
 # Kernel version for GIT packages
@@ -63,8 +63,8 @@ update_linux_pkgbuilds() {
     zfs_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-${zol_version}.tar.gz"
     spl_workdir="\${srcdir}/spl-${zol_version}"
     zfs_workdir="\${srcdir}/zfs-${zol_version}"
-    linux_depends="\"linux>=${kernel_version_major}\" \"linux<${kernel_version_next}\""
-    linux_headers_depends="\"linux-headers>=${kernel_version_major}\" \"linux-headers<${kernel_version_next}\""
+    linux_depends="\"linux=${kernel_version_major}\""
+    linux_headers_depends="\"linux-headers=${kernel_version_major}\""
     spl_replaces='replaces=("spl-git")'
     spl_utils_replaces='replaces=("spl-utils-git")'
     zfs_replaces='replaces=("zfs-git")'
@@ -99,17 +99,17 @@ update_linux_git_pkgbuilds() {
         spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
     fi
     spl_src_hash="SKIP"
-    spl_makedepends='makedepends=("git")'
+    linux_depends="\"linux=${kernel_version_major}\""
+    linux_headers_depends="\"linux-headers=${kernel_version_major}\""
+    spl_makedepends="\"git\""
     zfs_src_target="git+${zfs_git_url}"
     if [[ ${zfs_git_commit} != "" ]]; then
         spl_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
     fi
     zfs_src_hash="SKIP"
-    zfs_makedepends='makedepends=("git")'
+    zfs_makedepends="\"git\""
     spl_workdir="\${srcdir}/spl"
     zfs_workdir="\${srcdir}/zfs"
-    linux_depends="\"linux>=${kernel_version_major}\" \"linux<${kernel_version_next}\""
-    linux_headers_depends="\"linux-headers>=${kernel_version_major}\" \"linux-headers<${kernel_version_next}\""
     if have_command "update"; then
         git_check_repo
         git_calc_pkgver

src/spl-utils/PKGBUILD.sh

@@ -15,7 +15,7 @@ sha256sums=("${spl_src_hash}"
 groups=("${archzfs_package_group}")
 license=("GPL")
 provides=("spl-utils")
-${spl_makedepends}
+makedepends=(${linux_headers_depends} ${spl_makedepends})
 ${spl_utils_replaces}
 
 build() {

src/spl/PKGBUILD.sh

@@ -6,9 +6,8 @@ pkgname="${spl_pkgname}"
 pkgver=${spl_pkgver}
 pkgrel=${spl_pkgrel}
 pkgdesc="Solaris Porting Layer kernel modules."
-depends=("${spl_utils_pkgname}" "kmod"
-         ${linux_depends}
-         ${linux_headers_depends})
+depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
+makedepends=(${linux_headers_depends} ${spl_makedepends})
 arch=("x86_64")
 url="http://zfsonlinux.org/"
 source=("${spl_src_target}")
@@ -17,7 +16,6 @@ groups=("${archzfs_package_group}")
 license=("GPL")
 install=spl.install
 provides=("spl")
-${spl_makedepends}
 ${spl_replaces}
 
 build() {

src/zfs-utils/PKGBUILD.sh

@@ -6,9 +6,8 @@ pkgname="${zfs_utils_pkgname}"
 pkgver=${zfs_pkgver}
 pkgrel=${zfs_pkgrel}
 pkgdesc="Kernel module support files for the Zettabyte File System."
-depends=("${spl_pkgname}"
-         ${linux_depends}
-         ${linux_headers_depends})
+depends=("${spl_pkgname}" ${linux_depends})
+makedepends=(${linux_headers_depends} ${zfs_makedepends})
 arch=("x86_64")
 url="http://zfsonlinux.org/"
 source=("${zfs_src_target}"
@@ -22,7 +21,6 @@ sha256sums=("${zfs_src_hash}"
 license=("CDDL")
 groups=("${archzfs_package_group}")
 provides=("zfs-utils")
-${zfs_makedepends}
 ${zfs_utils_replaces}
 
 build() {

src/zfs/PKGBUILD.sh

@@ -6,9 +6,8 @@ pkgname="${zfs_pkgname}"
 pkgver=${zfs_pkgver}
 pkgrel=${zfs_pkgrel}
 pkgdesc="Kernel modules for the Zettabyte File System."
-depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}"
-         ${linux_depends}
-         ${linux_headers_depends})
+depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
+makedepends=(${linux_headers_depends} ${zfs_makedepends})
 arch=("x86_64")
 url="http://zfsonlinux.org/"
 source=("${zfs_src_target}")
@@ -17,7 +16,6 @@ groups=("${archzfs_package_group}")
 license=("CDDL")
 install=zfs.install
 provides=("zfs")
-${zfs_makedepends}
 ${zfs_replaces}
 
 build() {