diff --git a/packages/linux/spl-linux-git b/packages/linux/spl-linux-git index 1c64827..97c467c 160000 --- a/packages/linux/spl-linux-git +++ b/packages/linux/spl-linux-git @@ -1 +1 @@ -Subproject commit 1c64827c9181323df77da3e37d5a26b60a0ecab1 +Subproject commit 97c467c526d5d6f616a6de917a4e6ad61a646e70 diff --git a/packages/linux/spl-utils-linux-git b/packages/linux/spl-utils-linux-git index 9691b41..d2e4e48 160000 --- a/packages/linux/spl-utils-linux-git +++ b/packages/linux/spl-utils-linux-git @@ -1 +1 @@ -Subproject commit 9691b41360ad9f364c6261053a4affef1625b4d5 +Subproject commit d2e4e48d0a13d113b3598efabaff917a6f5d1c12 diff --git a/packages/linux/zfs-linux-git b/packages/linux/zfs-linux-git index 2f8e632..073ae82 160000 --- a/packages/linux/zfs-linux-git +++ b/packages/linux/zfs-linux-git @@ -1 +1 @@ -Subproject commit 2f8e632388059ab4b8ebe39641dc94e1333640f6 +Subproject commit 073ae8258f135ebb0bf9d1cb7d707dea02ab6cf4 diff --git a/packages/linux/zfs-utils-linux-git b/packages/linux/zfs-utils-linux-git index df4f910..01e510e 160000 --- a/packages/linux/zfs-utils-linux-git +++ b/packages/linux/zfs-utils-linux-git @@ -1 +1 @@ -Subproject commit df4f91064cb12a39ad590e10c8e2ed3461647542 +Subproject commit 01e510ea2818d0e47610599e35a5496a15f68fe3 diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh index fd316c7..a69bccd 100644 --- a/src/kernels/linux.sh +++ b/src/kernels/linux.sh @@ -4,7 +4,7 @@ mode_desc="Select and use the packages for the default linux kernel" # Kernel versions for default ZFS packages pkgrel="1" -kernel_version="4.6.4-1" +kernel_version="4.7-1" # Kernel version for GIT packages pkgrel_git="${pkgrel}" @@ -32,37 +32,37 @@ header="\ # archzfs github page. #" -update_linux_pkgbuilds() { - pkg_list=("spl-utils-linux" "spl-linux" "zfs-utils-linux" "zfs-linux") - kernel_version_full=$(kernel_version_full ${kernel_version}) - kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version}) - kernel_version_major=${kernel_version%-*} - kernel_mod_path="${kernel_version_full}-ARCH" - archzfs_package_group="archzfs-linux" - spl_pkgver=${zol_version}_${kernel_version_full_pkgver} - zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} - spl_pkgrel=${pkgrel} - zfs_pkgrel=${pkgrel} - spl_utils_pkgname="spl-utils-linux" - spl_pkgname="spl-linux" - zfs_utils_pkgname="zfs-utils-linux" - zfs_pkgname="zfs-linux" - # Paths are relative to build.sh - spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}" - spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" - zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}" - zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" - spl_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-${zol_version}.tar.gz" - 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_headers_depends="\"linux-headers=${kernel_version_major}\"" - spl_replaces='replaces=("spl-git")' - spl_utils_replaces='replaces=("spl-utils-git")' - zfs_replaces='replaces=("zfs-git")' - zfs_utils_replaces='replaces=("zfs-utils-git")' -} +# update_linux_pkgbuilds() { + # pkg_list=("spl-utils-linux" "spl-linux" "zfs-utils-linux" "zfs-linux") + # kernel_version_full=$(kernel_version_full ${kernel_version}) + # kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version}) + # kernel_version_major=${kernel_version%-*} + # kernel_mod_path="${kernel_version_full}-ARCH" + # archzfs_package_group="archzfs-linux" + # spl_pkgver=${zol_version}_${kernel_version_full_pkgver} + # zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} + # spl_pkgrel=${pkgrel} + # zfs_pkgrel=${pkgrel} + # spl_utils_pkgname="spl-utils-linux" + # spl_pkgname="spl-linux" + # zfs_utils_pkgname="zfs-utils-linux" + # zfs_pkgname="zfs-linux" + # # Paths are relative to build.sh + # spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}" + # spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" + # zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}" + # zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" + # spl_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-${zol_version}.tar.gz" + # 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_headers_depends="\"linux-headers=${kernel_version_major}\"" + # spl_replaces='replaces=("spl-git")' + # spl_utils_replaces='replaces=("spl-utils-git")' + # zfs_replaces='replaces=("zfs-git")' + # zfs_utils_replaces='replaces=("zfs-utils-git")' +# } update_linux_git_pkgbuilds() { pkg_list=("spl-utils-linux-git" "spl-linux-git" "zfs-utils-linux-git" "zfs-linux-git")