Update std and lts packages to fix depmod

conf.sh

@@ -7,7 +7,7 @@ spl_src_hash="167595fe76eb5497c3a1ffe396b6300155d0cbe46d06824a710099ca1ae1b8bd"
 spl_hostid_hash="ad95131bc0b799c0b1af477fb14fcf26a6a9f76079e48bf090acb7e8367bfd0e"
 zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
 zfs_initcpio_install_hash="1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df"
-zfs_initcpio_hook_hash="438a1399d1df5ef20eff37b4d775595fae9943d0c5c105c7bc286b2babcd759e"
+zfs_initcpio_hook_hash="67a96169d36853d8f18ee5a2443ecfcd2461a20f9109f4b281bee3945d83518a"
 
 # Notification address
 email="jeezusjr@gmail.com"

packages/linux-lts/spl-linux-lts

@@ -1 +1 @@
-Subproject commit 05d55aaf79f3cebae659db3fc933f3446ad6aeb6
+Subproject commit d4689156d9931143f9ceeb9673a2007e1809fb68

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

@@ -1 +1 @@
-Subproject commit 7356d0002d37def2185d77b70f337535806fe9c0
+Subproject commit 2c758f6f220fc3bb2e94a0b1d8d2b3efd10f25d3

packages/linux-lts/zfs-linux-lts

@@ -1 +1 @@
-Subproject commit 995caaea8a587ffb54150581a35c194a6b90de1b
+Subproject commit ec96b0798d96bf2c23c221de4a054b23143685fe

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

@@ -1 +1 @@
-Subproject commit 8445565f37d79649fcf367fcce67fb402db4f077
+Subproject commit adcb2fd8c264119f7027654c330ab48f86b29a6f

packages/linux/spl-linux

@@ -1 +1 @@
-Subproject commit fadc3bda237dd6176d395482c9a7166c82ede9e5
+Subproject commit c0e497a7b653fb67e084edf0c37a3c65595f08b1

packages/linux/spl-linux-git

@@ -1 +1 @@
-Subproject commit e4b52921fab82856660e607a19af6e30285443f2
+Subproject commit bb66809559aee02936bd864f5f27ebd0aa5adfeb

packages/linux/spl-utils-linux

@@ -1 +1 @@
-Subproject commit 6061727698ffbd13f63a22cb7c868d557174b01c
+Subproject commit dada84f59f6e0e891bccdef2cc7da398f48aabb6

packages/linux/spl-utils-linux-git

@@ -1 +1 @@
-Subproject commit af303efa6a82a344c9e6937232a453f6718950cd
+Subproject commit f9b2e2c19616ee2b44274ead8ca7a3f323b0db0d

packages/linux/zfs-linux

@@ -1 +1 @@
-Subproject commit e0d5aaddfd39bd0202156f863427099bdbe8f887
+Subproject commit 5583681b0fdc243382e901ae390c31aab4d0256b

packages/linux/zfs-linux-git

@@ -1 +1 @@
-Subproject commit 150ba142200f6f95ebe4798fafd45e3f95ef98ae
+Subproject commit 0a5f32ffdc6fbf747fe77cab007a58632ba5d666

packages/linux/zfs-utils-linux

@@ -1 +1 @@
-Subproject commit ab2ef9a42bc82f37d0cf38b34497f5b3fc33a1f2
+Subproject commit 650c426aac0033aea4f214c3fdca2879d1e025b2

packages/linux/zfs-utils-linux-git

@@ -1 +1 @@
-Subproject commit a79b4af02b038d2f54adf5fabc44dfbb9284b35f
+Subproject commit 247d8f08d3bd0bf6350e25d7aa6811d60c849ca9

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="3"
 kernel_version="4.4.8-1"
 kernel_version_next="4.5"
 
@@ -29,11 +29,12 @@ header="\
 update_linux_lts_pkgbuilds() {
     pkg_list="spl-utils-linux-lts spl-linux-lts zfs-utils-linux-lts zfs-linux-lts"
     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}-lts"
     archzfs_package_group="archzfs-linux-lts"
-    spl_pkgver=${zol_version}_$(kernel_version_full_no_hyphen ${kernel_version})
-    zfs_pkgver=${zol_version}_$(kernel_version_full_no_hyphen ${kernel_version})
+    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-lts"

src/kernels/linux.sh

@@ -3,7 +3,7 @@ mode_name="std"
 mode_desc="Select and use the packages for the default linux kernel"
 
 # Kernel versions for default ZFS packages
-pkgrel="1"
+pkgrel="3"
 kernel_version="4.5.1-1"
 kernel_version_next="4.6"
 
@@ -42,11 +42,12 @@ header="\
 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_no_hyphen ${kernel_version})
-    zfs_pkgver=${zol_version}_$(kernel_version_full_no_hyphen ${kernel_version})
+    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"
@@ -70,12 +71,15 @@ update_linux_git_pkgbuilds() {
     pkg_list="spl-utils-linux-git spl-linux-git zfs-utils-linux-git zfs-linux-git"
     kernel_version=${kernel_version_git}
     kernel_version_full=$(kernel_version_full ${kernel_version_git})
+    kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git})
     kernel_version_major=${kernel_version_git%-*}
     kernel_version_next=${kernel_version_git_next}
     kernel_mod_path="${kernel_version_full}-ARCH"
     archzfs_package_group="archzfs-linux-git"
-    spl_pkgver=""
-    zfs_pkgver=""
+    spl_pkgver="" # Set later by call to git_calc_pkgver
+    zfs_pkgver="" # Set later by call to git_calc_pkgver
+    spl_pkgver=${zol_version}_${kernel_version_full_pkgver}
+    zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
     spl_pkgrel=${pkgrel_git}
     zfs_pkgrel=${pkgrel_git}
     spl_utils_pkgname="spl-utils-linux-git"

src/spl/spl.install.sh

@@ -30,6 +30,6 @@ check_hostid() {
 
 run_depmod() {
     echo ">>> Updating SPL module dependencies"
-    depmod ${kernel_mod_path}
+    depmod -a ${kernel_mod_path}
 }
 EOF

src/zfs/zfs.install.sh

@@ -15,7 +15,7 @@ post_upgrade() {
 
 check_initramfs() {
     echo ">>> Updating ZFS module dependencies"
-    depmod ${kernel_mod_path}
+    depmod -a ${kernel_mod_path}
     MK_CONF=\$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo \$?);
     if [[ \${MK_CONF} == '0' ]]; then
         if [[ \$1 == 'remove' ]]; then
@@ -24,7 +24,7 @@ check_initramfs() {
             echo '>>> "hooks" list and then regenerate the initial ramdisk.'
         else
             echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-            mkinitcpio -p linux
+            mkinitcpio -p ${MODE_NAME}
         fi
     fi
 }