Update packages

Closes #255
7 years ago · ceb11e7410
parent 17fbca9889
commit ceb11e7410
25 changed files with 31 additions and 30 deletions
--- a/packages/common-git/zfs-utils-common-git
+++ b/packages/common-git/zfs-utils-common-git
@ -1 +1 @@
-Subproject commit 686f099333be7b6d34aad065e8bb26fdec11f3de
+Subproject commit 48e333ffa9a1370f160f3f2796d5a50286b76634
--- a/packages/dkms/spl-dkms/.SRCINFO
+++ b/packages/dkms/spl-dkms/.SRCINFO
@ -6,7 +6,6 @@ pkgbase = spl-dkms
 	arch = x86_64
 	groups = archzfs-dkms
 	license = GPL
-	makedepends = git
 	depends = spl-utils-common=0.7.9
 	depends = dkms
 	provides = spl
--- a/packages/dkms/zfs-dkms-git/.SRCINFO
+++ b/packages/dkms/zfs-dkms-git/.SRCINFO
@ -1,16 +1,17 @@
 pkgbase = zfs-dkms-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 2018.05.26.r3492.g3e5300e0e
+	pkgver = 2018.06.13.r4598.g1fac63e56
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	groups = archzfs-dkms-git
 	license = CDDL
 	makedepends = git
-	depends = spl-dkms-git
-	depends = zfs-utils-common-git=2018.05.26.r3492.g3e5300e0e
+	depends = zfs-utils-common-git=2018.06.13.r4598.g1fac63e56
+	depends = lsb-release
 	provides = zfs
 	conflicts = zfs-dkms
+	conflicts = spl-dkms-git
 	conflicts = zfs-archiso-linux
 	conflicts = zfs-archiso-linux-git
 	conflicts = zfs-linux-hardened
@ -35,7 +36,8 @@ pkgbase = zfs-dkms-git
 	conflicts = zfs-linux-vfio-git-headers
 	conflicts = zfs-linux-zen-headers
 	conflicts = zfs-linux-zen-git-headers
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=3e5300e0ed3c4b49e3b0dab7daded1e3bfaaded7
+	replaces = spl-dkms-git
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=1fac63e56f370f675b23687ee2e634744c54e818
 	sha256sums = SKIP

 pkgname = zfs-dkms-git
--- a/packages/dkms/zfs-dkms-git/PKGBUILD
+++ b/packages/dkms/zfs-dkms-git/PKGBUILD
@ -8,15 +8,15 @@
 pkgname="zfs-dkms-git"
 pkgdesc="Kernel modules for the Zettabyte File System."

-pkgver=2018.05.31.r4577.g1a5b96b8e
+pkgver=2018.06.13.r4598.g1fac63e56
 pkgrel=1
 makedepends=("git")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=1a5b96b8ee66da5dfdfbedcb6bc462f454b4a25d")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=1fac63e56f370f675b23687ee2e634744c54e818")
 sha256sums=("SKIP")
 license=("CDDL")
-depends=("zfs-utils-common-git=2018.05.31.r4577.g1a5b96b8e" "lsb-release")
+depends=("zfs-utils-common-git=2018.06.13.r4598.g1fac63e56" "lsb-release")
 provides=("zfs")
 groups=("archzfs-dkms-git")
 conflicts=('zfs-dkms' 'spl-dkms-git' 'zfs-archiso-linux' 'zfs-archiso-linux-git' 'zfs-linux-hardened' 'zfs-linux-hardened-git' 'zfs-linux-lts' 'zfs-linux-lts-git' 'zfs-linux' 'zfs-linux-git' 'zfs-linux-vfio' 'zfs-linux-vfio-git' 'zfs-linux-zen' 'zfs-linux-zen-git'  'zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
--- a/packages/dkms/zfs-dkms/.SRCINFO
+++ b/packages/dkms/zfs-dkms/.SRCINFO
@ -6,9 +6,9 @@ pkgbase = zfs-dkms
 	arch = x86_64
 	groups = archzfs-dkms
 	license = CDDL
-	makedepends = git
 	depends = spl-dkms
 	depends = zfs-utils-common=0.7.9
+	depends = lsb-release
 	provides = zfs
 	conflicts = zfs-dkms-git
 	conflicts = zfs-archiso-linux
--- a/packages/linux-hardened/spl-linux-hardened
+++ b/packages/linux-hardened/spl-linux-hardened
@ -1 +1 @@
-Subproject commit db229c4b0afef3ea6eef3a57cf765b7ad34e06cc
+Subproject commit e6e29a9a09482c0f3fdde68c8070be636527536f
--- a/packages/linux-hardened/zfs-linux-hardened
+++ b/packages/linux-hardened/zfs-linux-hardened
@ -1 +1 @@
-Subproject commit cb91fc2929c332fa8308eaa63170e1cee1d332bd
+Subproject commit 4805b5c9e37cefc213287278c8d5832be74ea8c5
--- a/packages/linux-hardened/zfs-linux-hardened-git
+++ b/packages/linux-hardened/zfs-linux-hardened-git
@ -1 +1 @@
-Subproject commit 8e66fa0c0a25285de12b52c9e8b42b0304fe04f0
+Subproject commit 082919257ba356a7f488b56b6e381fc6fe9829e4
--- a/packages/linux-lts/spl-linux-lts
+++ b/packages/linux-lts/spl-linux-lts
@ -1 +1 @@
-Subproject commit e20f852e16ff98415e2bf3a6894e31fcbaeb2f41
+Subproject commit 476e10aeaea987ced97ce98a437a5eff92affa82
--- a/packages/linux-lts/zfs-linux-lts
+++ b/packages/linux-lts/zfs-linux-lts
@ -1 +1 @@
-Subproject commit acbf4a4cc1281180133c7a337f7c0a8e78d12732
+Subproject commit 486254314c0a00fc063770e40c5bae3c110310ae
--- a/packages/linux-lts/zfs-linux-lts-git
+++ b/packages/linux-lts/zfs-linux-lts-git
@ -1 +1 @@
-Subproject commit 1c15cba4335cde40c9a70b647ee23a602e06f8ae
+Subproject commit 125b4dc0549af05accc330a63a7cebd7b513ab8a
--- a/packages/linux-vfio/spl-linux-vfio
+++ b/packages/linux-vfio/spl-linux-vfio
@ -1 +1 @@
-Subproject commit 18efdcf8dcab3185fcd5a8b43b2f0abb4cc23ae7
+Subproject commit 148b01aa1130e9c459d6c93b200bd7a41487bcfe
--- a/packages/linux-vfio/zfs-linux-vfio
+++ b/packages/linux-vfio/zfs-linux-vfio
@ -1 +1 @@
-Subproject commit a44a10f57708d178cfaf8c6b8cca5ec03129a449
+Subproject commit a7421370b573ce2768dbff0504b668655d8b0d2f
--- a/packages/linux-vfio/zfs-linux-vfio-git
+++ b/packages/linux-vfio/zfs-linux-vfio-git
@ -1 +1 @@
-Subproject commit b2e659800f324ee80ddb7119218ce6ede579f9f3
+Subproject commit b48f9ed75a2a0c425b19ae1dc419da8e7ae6de2c
--- a/packages/linux-zen/spl-linux-zen
+++ b/packages/linux-zen/spl-linux-zen
@ -1 +1 @@
-Subproject commit cac192646d3bc316dc290cf6251ad133bfffc0c2
+Subproject commit 7dc47939fa862ce38805109bff76bb121089445d
--- a/packages/linux-zen/zfs-linux-zen
+++ b/packages/linux-zen/zfs-linux-zen
@ -1 +1 @@
-Subproject commit cd545d9cbcc64fcb920f210c4dfcdb5fffe90be9
+Subproject commit 1280dd393904b2e77f77173d0b94f3616a745d0e
--- a/packages/linux-zen/zfs-linux-zen-git
+++ b/packages/linux-zen/zfs-linux-zen-git
@ -1 +1 @@
-Subproject commit bbbb7332e37a4121306960946113ff554ac001e4
+Subproject commit cad80c53110a18ebd888fb6b05a31bd6a4b9ef0c
--- a/packages/linux/spl-linux
+++ b/packages/linux/spl-linux
@ -1 +1 @@
-Subproject commit 99cb75157bb0cecbaf4382d438dfc4a021043a6f
+Subproject commit 63834c81d9ef08c657d56717d47a957b464abf59
--- a/packages/linux/zfs-linux
+++ b/packages/linux/zfs-linux
@ -1 +1 @@
-Subproject commit b06349f0f290e086698f6fd01d5938b178b6b004
+Subproject commit 6ce3b9bd57e4d8f617f45b3ae63a67567b51f93e
--- a/packages/linux/zfs-linux-git
+++ b/packages/linux/zfs-linux-git
@ -1 +1 @@
-Subproject commit eb7ed2e40c50f8f48b35c3c02efd1ad34cb578a5
+Subproject commit 5112bb076b9f4e33b596c3757ff5eb650a75a27c
--- a/src/kernels/linux-hardened.sh
+++ b/src/kernels/linux-hardened.sh
@ -5,7 +5,7 @@ mode_desc="Select and use the packages for the linux-hardened kernel"

 # Kernel versions for hardened packages
 pkgrel="1"
-kernel_version="4.16.13.a-1"
+kernel_version="4.16.15.a-1"

 # Kernel version for GIT packages
 pkgrel_git="${pkgrel}"
--- a/src/kernels/linux-lts.sh
+++ b/src/kernels/linux-lts.sh
@ -5,7 +5,7 @@ mode_desc="Select and use the packages for the linux-lts kernel"

 # Kernel versions for LTS packages
 pkgrel="1"
-kernel_version="4.14.47-1"
+kernel_version="4.14.49-1"

 # Kernel version for GIT packages
 pkgrel_git="${pkgrel}"
--- a/src/kernels/linux-vfio.sh
+++ b/src/kernels/linux-vfio.sh
@ -5,7 +5,7 @@ mode_desc="Select and use the packages for the linux-vfio kernel"

 # Kernel versions for default ZFS packages
 pkgrel="1"
-kernel_version="4.16.10-1"
+kernel_version="4.16.13-1"

 # Kernel version for GIT packages
 pkgrel_git="${pkgrel}"
--- a/src/kernels/linux-zen.sh
+++ b/src/kernels/linux-zen.sh
@ -5,7 +5,7 @@ mode_desc="Select and use the packages for the linux-zen kernel"

 # Kernel versions for default ZFS packages
 pkgrel="1"
-kernel_version="4.16.13-1"
+kernel_version="4.16.13-2"

 # Kernel version for GIT packages
 pkgrel_git="${pkgrel}"
--- a/src/kernels/linux.sh
+++ b/src/kernels/linux.sh
@ -5,7 +5,7 @@ mode_desc="Select and use the packages for the default linux kernel"

 # Kernel versions for default ZFS packages
 pkgrel="1"
-kernel_version="4.16.13-1"
+kernel_version="4.16.13-2"

 # Kernel version for GIT packages
 pkgrel_git="${pkgrel}"