diff --git a/conf.sh b/conf.sh index 9fd2807..81ade32 100644 --- a/conf.sh +++ b/conf.sh @@ -1,9 +1,9 @@ # ZFSonLinux stable version -zol_version="0.7.4" +zol_version="0.7.5" # The ZOL source hashes are from zfsonlinux.org -spl_src_hash="cae43c81838f90a444be25bdff5c6c3ee99ffe515a2f477d9758a6274a1a7dc4" -zfs_src_hash="9536a9be5d05329570afc9fc168be45cd38f832e2e7ede15f2c5cd223beb16d3" +spl_src_hash="c4845d9a6123397c53ee003ed1712f2996a50ac2a9a30d1490280771484d08a6" +zfs_src_hash="1b826407418423379ff898c0e6ee0ada59c70754e6085a7663028330d0d8a44a" zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540" zfs_initcpio_install_hash="e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4" diff --git a/packages/common-git/spl-utils-common-git b/packages/common-git/spl-utils-common-git index 596acb1..be1ab6e 160000 --- a/packages/common-git/spl-utils-common-git +++ b/packages/common-git/spl-utils-common-git @@ -1 +1 @@ -Subproject commit 596acb130fbce1dd62aee1f23e7939588e79d19a +Subproject commit be1ab6ea78071b228ba7bb93bd87c74c59d3dde3 diff --git a/packages/common-git/zfs-utils-common-git b/packages/common-git/zfs-utils-common-git index 21052ad..40f2a81 160000 --- a/packages/common-git/zfs-utils-common-git +++ b/packages/common-git/zfs-utils-common-git @@ -1 +1 @@ -Subproject commit 21052ad8ece90ea0fdcede8020468643dd67133c +Subproject commit 40f2a819bd9cf6ea067afd7085a3cfd457dc68a4 diff --git a/packages/common/spl-utils-common b/packages/common/spl-utils-common index 9dbad11..f8cf6a9 160000 --- a/packages/common/spl-utils-common +++ b/packages/common/spl-utils-common @@ -1 +1 @@ -Subproject commit 9dbad117a8336be60ca8d65e908993899262618a +Subproject commit f8cf6a95d28a2e01ba246eb40b8d75ae9d98fc92 diff --git a/packages/common/zfs-utils-common b/packages/common/zfs-utils-common index 186d8c5..cd832d1 160000 --- a/packages/common/zfs-utils-common +++ b/packages/common/zfs-utils-common @@ -1 +1 @@ -Subproject commit 186d8c50044b7847867ea596dbade4b560f75e28 +Subproject commit cd832d122d4e733d124c42b3cfc82218580a041b diff --git a/packages/dkms/spl-dkms-git/.SRCINFO b/packages/dkms/spl-dkms-git/.SRCINFO index 2547d14..6fd4480 100644 --- a/packages/dkms/spl-dkms-git/.SRCINFO +++ b/packages/dkms/spl-dkms-git/.SRCINFO @@ -1,15 +1,15 @@ # Generated by mksrcinfo v8 -# Mon Dec 18 22:12:32 UTC 2017 +# Fri Dec 22 00:54:27 UTC 2017 pkgbase = spl-dkms-git pkgdesc = Solaris Porting Layer kernel modules. - pkgver = 2017.11.15.r1059.ed19bcc - pkgrel = 3 + pkgver = 2017.12.21.r1060.c9821f1 + pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 groups = archzfs-dkms-git license = GPL makedepends = git - depends = spl-utils-common-git=2017.11.15.r1059.ed19bcc + depends = spl-utils-common-git=2017.12.21.r1060.c9821f1 depends = dkms provides = spl conflicts = spl-dkms @@ -35,7 +35,7 @@ pkgbase = spl-dkms-git conflicts = spl-linux-vfio-git-headers conflicts = spl-linux-zen-headers conflicts = spl-linux-zen-git-headers - source = git+https://github.com/zfsonlinux/spl.git#commit=ed19bccfb651843fa208232b3a2d3d22a4152bc8 + source = git+https://github.com/zfsonlinux/spl.git#commit=c9821f1ccc647dfbd506f381b736c664d862d126 sha256sums = SKIP pkgname = spl-dkms-git diff --git a/packages/dkms/spl-dkms-git/PKGBUILD b/packages/dkms/spl-dkms-git/PKGBUILD index b06323d..d1b8e36 100644 --- a/packages/dkms/spl-dkms-git/PKGBUILD +++ b/packages/dkms/spl-dkms-git/PKGBUILD @@ -8,15 +8,15 @@ pkgname="spl-dkms-git" pkgdesc="Solaris Porting Layer kernel modules." -pkgver=2017.11.15.r1059.ed19bcc -pkgrel=3 +pkgver=2017.12.21.r1060.c9821f1 +pkgrel=1 makedepends=("git") arch=("x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/spl.git#commit=ed19bccfb651843fa208232b3a2d3d22a4152bc8") +source=("git+https://github.com/zfsonlinux/spl.git#commit=c9821f1ccc647dfbd506f381b736c664d862d126") sha256sums=("SKIP") license=("GPL") -depends=("spl-utils-common-git=2017.11.15.r1059.ed19bcc" "dkms") +depends=("spl-utils-common-git=2017.12.21.r1060.c9821f1" "dkms") provides=("spl") groups=("archzfs-dkms-git") conflicts=('spl-dkms' 'spl-archiso-linux' 'spl-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-lts' 'spl-linux-lts-git' 'spl-linux' 'spl-linux-git' 'spl-linux-vfio' 'spl-linux-vfio-git' 'spl-linux-zen' 'spl-linux-zen-git' 'spl-archiso-linux-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-vfio-headers' 'spl-linux-vfio-git-headers' 'spl-linux-zen-headers' 'spl-linux-zen-git-headers' ) diff --git a/packages/dkms/spl-dkms/.SRCINFO b/packages/dkms/spl-dkms/.SRCINFO index 9c9873d..da93757 100644 --- a/packages/dkms/spl-dkms/.SRCINFO +++ b/packages/dkms/spl-dkms/.SRCINFO @@ -1,15 +1,15 @@ # Generated by mksrcinfo v8 -# Mon Dec 18 22:11:37 UTC 2017 +# Fri Dec 22 00:53:33 UTC 2017 pkgbase = spl-dkms pkgdesc = Solaris Porting Layer kernel modules. - pkgver = 0.7.4 - pkgrel = 3 + pkgver = 0.7.5 + pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 groups = archzfs-dkms license = GPL makedepends = git - depends = spl-utils-common=0.7.4 + depends = spl-utils-common=0.7.5 depends = dkms provides = spl conflicts = spl-dkms-git @@ -35,7 +35,7 @@ pkgbase = spl-dkms conflicts = spl-linux-vfio-git-headers conflicts = spl-linux-zen-headers conflicts = spl-linux-zen-git-headers - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.4/spl-0.7.4.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.5/spl-0.7.5.tar.gz sha256sums = SKIP pkgname = spl-dkms diff --git a/packages/dkms/spl-dkms/PKGBUILD b/packages/dkms/spl-dkms/PKGBUILD index 363d9df..70fc360 100644 --- a/packages/dkms/spl-dkms/PKGBUILD +++ b/packages/dkms/spl-dkms/PKGBUILD @@ -8,30 +8,30 @@ pkgname="spl-dkms" pkgdesc="Solaris Porting Layer kernel modules." -pkgver=0.7.4 -pkgrel=3 +pkgver=0.7.5 +pkgrel=1 makedepends=("git") arch=("x86_64") url="http://zfsonlinux.org/" -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.4/spl-0.7.4.tar.gz") +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.5/spl-0.7.5.tar.gz") sha256sums=("SKIP") license=("GPL") -depends=("spl-utils-common=0.7.4" "dkms") +depends=("spl-utils-common=0.7.5" "dkms") provides=("spl") groups=("archzfs-dkms") conflicts=('spl-dkms-git' 'spl-archiso-linux' 'spl-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-lts' 'spl-linux-lts-git' 'spl-linux' 'spl-linux-git' 'spl-linux-vfio' 'spl-linux-vfio-git' 'spl-linux-zen' 'spl-linux-zen-git' 'spl-archiso-linux-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-vfio-headers' 'spl-linux-vfio-git-headers' 'spl-linux-zen-headers' 'spl-linux-zen-git-headers' ) build() { - cd "${srcdir}/spl-0.7.4" + cd "${srcdir}/spl-0.7.5" ./autogen.sh } package() { - dkmsdir="${pkgdir}/usr/src/spl-0.7.4" + dkmsdir="${pkgdir}/usr/src/spl-0.7.5" install -d "${dkmsdir}" - cp -a ${srcdir}/spl-0.7.4/. ${dkmsdir} + cp -a ${srcdir}/spl-0.7.5/. ${dkmsdir} cd "${dkmsdir}" find . -name ".git*" -print0 | xargs -0 rm -fr -- - scripts/dkms.mkconf -v 0.7.4 -f dkms.conf -n spl + scripts/dkms.mkconf -v 0.7.5 -f dkms.conf -n spl chmod g-w,o-w -R . } diff --git a/packages/dkms/zfs-dkms-git/.SRCINFO b/packages/dkms/zfs-dkms-git/.SRCINFO index f45a0d4..ccc7949 100644 --- a/packages/dkms/zfs-dkms-git/.SRCINFO +++ b/packages/dkms/zfs-dkms-git/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Dec 18 22:12:33 UTC 2017 +# Fri Dec 22 00:54:27 UTC 2017 pkgbase = zfs-dkms-git pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2017.12.18.r3214.bbffb59ef - pkgrel = 3 + pkgver = 2017.12.21.r3220.a8b2e3068 + pkgrel = 1 url = http://zfsonlinux.org/ install = zfs.install arch = x86_64 @@ -11,7 +11,7 @@ pkgbase = zfs-dkms-git license = CDDL makedepends = git depends = spl-dkms-git - depends = zfs-utils-common-git=2017.12.18.r3214.bbffb59ef + depends = zfs-utils-common-git=2017.12.21.r3220.a8b2e3068 provides = zfs conflicts = zfs-dkms conflicts = zfs-archiso-linux @@ -36,7 +36,7 @@ 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=bbffb59efc49baba1d131d497202e8cda0068c3d + source = git+https://github.com/zfsonlinux/zfs.git#commit=a8b2e30685c9214ccfd0181977540e080340df4e sha256sums = SKIP pkgname = zfs-dkms-git diff --git a/packages/dkms/zfs-dkms-git/PKGBUILD b/packages/dkms/zfs-dkms-git/PKGBUILD index 755a4af..c555367 100644 --- 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=2017.12.18.r3214.bbffb59ef -pkgrel=3 +pkgver=2017.12.21.r3220.a8b2e3068 +pkgrel=1 makedepends=("git") arch=("x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git#commit=bbffb59efc49baba1d131d497202e8cda0068c3d") +source=("git+https://github.com/zfsonlinux/zfs.git#commit=a8b2e30685c9214ccfd0181977540e080340df4e") sha256sums=("SKIP") license=("CDDL") -depends=("spl-dkms-git" "zfs-utils-common-git=2017.12.18.r3214.bbffb59ef") +depends=("spl-dkms-git" "zfs-utils-common-git=2017.12.21.r3220.a8b2e3068") install=zfs.install provides=("zfs") groups=("archzfs-dkms-git") diff --git a/packages/dkms/zfs-dkms/.SRCINFO b/packages/dkms/zfs-dkms/.SRCINFO index 841e3f1..467fbcf 100644 --- a/packages/dkms/zfs-dkms/.SRCINFO +++ b/packages/dkms/zfs-dkms/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Dec 18 22:11:38 UTC 2017 +# Fri Dec 22 00:53:33 UTC 2017 pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 0.7.4 - pkgrel = 3 + pkgver = 0.7.5 + pkgrel = 1 url = http://zfsonlinux.org/ install = zfs.install arch = x86_64 @@ -11,7 +11,7 @@ pkgbase = zfs-dkms license = CDDL makedepends = git depends = spl-dkms - depends = zfs-utils-common=0.7.4 + depends = zfs-utils-common=0.7.5 provides = zfs conflicts = zfs-dkms-git conflicts = zfs-archiso-linux @@ -36,7 +36,7 @@ pkgbase = zfs-dkms conflicts = zfs-linux-vfio-git-headers conflicts = zfs-linux-zen-headers conflicts = zfs-linux-zen-git-headers - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.4/zfs-0.7.4.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.5/zfs-0.7.5.tar.gz sha256sums = SKIP pkgname = zfs-dkms diff --git a/packages/dkms/zfs-dkms/PKGBUILD b/packages/dkms/zfs-dkms/PKGBUILD index 27e4236..a011acd 100644 --- a/packages/dkms/zfs-dkms/PKGBUILD +++ b/packages/dkms/zfs-dkms/PKGBUILD @@ -8,31 +8,31 @@ pkgname="zfs-dkms" pkgdesc="Kernel modules for the Zettabyte File System." -pkgver=0.7.4 -pkgrel=3 +pkgver=0.7.5 +pkgrel=1 makedepends=("git") arch=("x86_64") url="http://zfsonlinux.org/" -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.4/zfs-0.7.4.tar.gz") +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.5/zfs-0.7.5.tar.gz") sha256sums=("SKIP") license=("CDDL") -depends=("spl-dkms" "zfs-utils-common=0.7.4") +depends=("spl-dkms" "zfs-utils-common=0.7.5") install=zfs.install provides=("zfs") groups=("archzfs-dkms") conflicts=('zfs-dkms-git' 'zfs-archiso-linux' '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-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' ) build() { - cd "${srcdir}/zfs-0.7.4" + cd "${srcdir}/zfs-0.7.5" ./autogen.sh } package() { - dkmsdir="${pkgdir}/usr/src/zfs-0.7.4" + dkmsdir="${pkgdir}/usr/src/zfs-0.7.5" install -d "${dkmsdir}" - cp -a ${srcdir}/zfs-0.7.4/. ${dkmsdir} + cp -a ${srcdir}/zfs-0.7.5/. ${dkmsdir} cd "${dkmsdir}" find . -name ".git*" -print0 | xargs -0 rm -fr -- - scripts/dkms.mkconf -v 0.7.4 -f dkms.conf -n zfs + scripts/dkms.mkconf -v 0.7.5 -f dkms.conf -n zfs chmod g-w,o-w -R . } diff --git a/packages/dkms/zfs-dkms/zfs.install b/packages/dkms/zfs-dkms/zfs.install index 8af1a69..66c19aa 100644 --- a/packages/dkms/zfs-dkms/zfs.install +++ b/packages/dkms/zfs-dkms/zfs.install @@ -1,7 +1,7 @@ post_install() { # https://bugs.archlinux.org/task/52901 echo '>>> If DKMS fails to build ZFS, run this command:' - echo -e '# dkms install -m zfs/0.7.4 -k \n' + echo -e '# dkms install -m zfs/0.7.5 -k \n' echo 'If you are using ZFS on your root partition run this afterwards:' echo '# mkinitcpio -P' diff --git a/packages/linux-hardened/spl-linux-hardened b/packages/linux-hardened/spl-linux-hardened index 2045b69..6bba9cc 160000 --- a/packages/linux-hardened/spl-linux-hardened +++ b/packages/linux-hardened/spl-linux-hardened @@ -1 +1 @@ -Subproject commit 2045b6915b6356ea33877ac5a8d8678222a89587 +Subproject commit 6bba9ccdff214400103cc8448e6a343e1b730883 diff --git a/packages/linux-hardened/spl-linux-hardened-git b/packages/linux-hardened/spl-linux-hardened-git index 1789fa7..57d0cfc 160000 --- a/packages/linux-hardened/spl-linux-hardened-git +++ b/packages/linux-hardened/spl-linux-hardened-git @@ -1 +1 @@ -Subproject commit 1789fa79b4e82c62eec0d8305bf890bfe79ea5cf +Subproject commit 57d0cfc210f1e769136f4bedb9b1be1d51a05fb8 diff --git a/packages/linux-hardened/zfs-linux-hardened b/packages/linux-hardened/zfs-linux-hardened index e53ff34..69ac7e1 160000 --- a/packages/linux-hardened/zfs-linux-hardened +++ b/packages/linux-hardened/zfs-linux-hardened @@ -1 +1 @@ -Subproject commit e53ff34df53033acbe814416a43aa33750112335 +Subproject commit 69ac7e18087b74862d3583be062ea69f4c9f0a87 diff --git a/packages/linux-hardened/zfs-linux-hardened-git b/packages/linux-hardened/zfs-linux-hardened-git index 80f7f86..c230ed7 160000 --- a/packages/linux-hardened/zfs-linux-hardened-git +++ b/packages/linux-hardened/zfs-linux-hardened-git @@ -1 +1 @@ -Subproject commit 80f7f86b482c9c34f675422958601fc63fbaeaa8 +Subproject commit c230ed76e359b55ee259cd2a096bc3db70d0cc63 diff --git a/packages/linux-lts/spl-linux-lts b/packages/linux-lts/spl-linux-lts index fe75024..43ddb1b 160000 --- a/packages/linux-lts/spl-linux-lts +++ b/packages/linux-lts/spl-linux-lts @@ -1 +1 @@ -Subproject commit fe75024833df07d4a6f33087f155d3c2da27718c +Subproject commit 43ddb1b09813686b12411aaf9d8086ddbc4547cc diff --git a/packages/linux-lts/spl-linux-lts-git b/packages/linux-lts/spl-linux-lts-git index 2b71d4b..8c23c98 160000 --- a/packages/linux-lts/spl-linux-lts-git +++ b/packages/linux-lts/spl-linux-lts-git @@ -1 +1 @@ -Subproject commit 2b71d4bf13c2102cc525e27c91a577177201647b +Subproject commit 8c23c98a52b540ad29f3bfd83727c7ecc0330c9f diff --git a/packages/linux-lts/zfs-linux-lts b/packages/linux-lts/zfs-linux-lts index 9b3ed65..ac12111 160000 --- a/packages/linux-lts/zfs-linux-lts +++ b/packages/linux-lts/zfs-linux-lts @@ -1 +1 @@ -Subproject commit 9b3ed651b96c0a7784cd4df8620da0f7a5c9c5c9 +Subproject commit ac1211145e2626880abd6040ca5d2bdda03e79ab diff --git a/packages/linux-lts/zfs-linux-lts-git b/packages/linux-lts/zfs-linux-lts-git index 8c97c4d..f05596e 160000 --- a/packages/linux-lts/zfs-linux-lts-git +++ b/packages/linux-lts/zfs-linux-lts-git @@ -1 +1 @@ -Subproject commit 8c97c4dddcd394f93756e26f1d0dcf0ac3816a3b +Subproject commit f05596e96a3cc03f8550ae7987e24a67498c20cc diff --git a/packages/linux-vfio/spl-linux-vfio b/packages/linux-vfio/spl-linux-vfio index 75388cf..6351707 160000 --- a/packages/linux-vfio/spl-linux-vfio +++ b/packages/linux-vfio/spl-linux-vfio @@ -1 +1 @@ -Subproject commit 75388cfeed8d79a44d71177b97653b75a6e1dcfb +Subproject commit 635170737794fbc15016ad56b1f7fe99360a7a63 diff --git a/packages/linux-vfio/spl-linux-vfio-git b/packages/linux-vfio/spl-linux-vfio-git index 6d7e60e..d5beafc 160000 --- a/packages/linux-vfio/spl-linux-vfio-git +++ b/packages/linux-vfio/spl-linux-vfio-git @@ -1 +1 @@ -Subproject commit 6d7e60e6ae326f3a28dce7d236a24a868ebb185c +Subproject commit d5beafc214012051e289c10ed6bf33b98ac955a4 diff --git a/packages/linux-vfio/zfs-linux-vfio b/packages/linux-vfio/zfs-linux-vfio index f89ef78..87212f0 160000 --- a/packages/linux-vfio/zfs-linux-vfio +++ b/packages/linux-vfio/zfs-linux-vfio @@ -1 +1 @@ -Subproject commit f89ef788ce4b545ad8bc61b6b486aca6fce36298 +Subproject commit 87212f01836b4f142659989a8ae51695b930d017 diff --git a/packages/linux-vfio/zfs-linux-vfio-git b/packages/linux-vfio/zfs-linux-vfio-git index 9bd83ae..925b779 160000 --- a/packages/linux-vfio/zfs-linux-vfio-git +++ b/packages/linux-vfio/zfs-linux-vfio-git @@ -1 +1 @@ -Subproject commit 9bd83ae38a771ba4bce7e3c3f29de5615dc01f53 +Subproject commit 925b779567122b0103972edb4332a2bdbca6828c diff --git a/packages/linux-zen/spl-linux-zen b/packages/linux-zen/spl-linux-zen index 9f3a1d9..5809ad4 160000 --- a/packages/linux-zen/spl-linux-zen +++ b/packages/linux-zen/spl-linux-zen @@ -1 +1 @@ -Subproject commit 9f3a1d91d35dcc9efd53ba412260b4ca9fb977f8 +Subproject commit 5809ad43f15ac01db3f6bad1833abf46140e1140 diff --git a/packages/linux-zen/spl-linux-zen-git b/packages/linux-zen/spl-linux-zen-git index 2f11a85..236914d 160000 --- a/packages/linux-zen/spl-linux-zen-git +++ b/packages/linux-zen/spl-linux-zen-git @@ -1 +1 @@ -Subproject commit 2f11a85e821ac2d3b1090ac62a8390f8db1d8730 +Subproject commit 236914d85780d9a697147d0bb114b922f58fc7f3 diff --git a/packages/linux-zen/zfs-linux-zen b/packages/linux-zen/zfs-linux-zen index d3ced39..5600590 160000 --- a/packages/linux-zen/zfs-linux-zen +++ b/packages/linux-zen/zfs-linux-zen @@ -1 +1 @@ -Subproject commit d3ced39a7e1cc9cb9c554d1b5b0fd367acbe6ae4 +Subproject commit 56005905363ea2a757da00f6ece80ac0a83d1143 diff --git a/packages/linux-zen/zfs-linux-zen-git b/packages/linux-zen/zfs-linux-zen-git index 15abbf5..7184c15 160000 --- a/packages/linux-zen/zfs-linux-zen-git +++ b/packages/linux-zen/zfs-linux-zen-git @@ -1 +1 @@ -Subproject commit 15abbf589c0a75324755f14eea4053c69577fba9 +Subproject commit 7184c153a5193cd4fdd2741258269150601d2400 diff --git a/packages/linux/spl-linux b/packages/linux/spl-linux index 26f152c..997ea28 160000 --- a/packages/linux/spl-linux +++ b/packages/linux/spl-linux @@ -1 +1 @@ -Subproject commit 26f152c95e2fd3d77ff8a109ff26b8b678b26d83 +Subproject commit 997ea2847a7762a0b8b72e30af96c15bd2cac03c diff --git a/packages/linux/spl-linux-git b/packages/linux/spl-linux-git index 4113d5a..3a86523 160000 --- a/packages/linux/spl-linux-git +++ b/packages/linux/spl-linux-git @@ -1 +1 @@ -Subproject commit 4113d5a3aa03e5617e93793b0424ce6a2265959a +Subproject commit 3a86523e223a0e02e55b0821114b8855c2ecec0f diff --git a/packages/linux/zfs-linux b/packages/linux/zfs-linux index 18518af..5c413e6 160000 --- a/packages/linux/zfs-linux +++ b/packages/linux/zfs-linux @@ -1 +1 @@ -Subproject commit 18518af43c578ea71ec83a575c8b32826276667a +Subproject commit 5c413e676adc1ef416c5679e1e1feeff2567fa48 diff --git a/packages/linux/zfs-linux-git b/packages/linux/zfs-linux-git index 68da6b9..ae7c375 160000 --- a/packages/linux/zfs-linux-git +++ b/packages/linux/zfs-linux-git @@ -1 +1 @@ -Subproject commit 68da6b9d25d07b81302e9ba744d8e9a99e0a6cdf +Subproject commit ae7c375f353516328561d62a89ed82ea91206180 diff --git a/src/kernels/common-git.sh b/src/kernels/common-git.sh index 11a8ff4..a52cded 100644 --- a/src/kernels/common-git.sh +++ b/src/kernels/common-git.sh @@ -3,7 +3,7 @@ mode_name="common-git" mode_desc="Select and use the packages that are common between all kernels (git version)" # Version for GIT packages -pkgrel_git="2" +pkgrel_git="1" zfs_git_commit="" spl_git_commit="" zfs_git_url="https://github.com/zfsonlinux/zfs.git" diff --git a/src/kernels/common.sh b/src/kernels/common.sh index be129f8..37e2238 100644 --- a/src/kernels/common.sh +++ b/src/kernels/common.sh @@ -3,7 +3,7 @@ mode_name="common" mode_desc="Select and use the packages that are common between all kernels" # version -pkgrel="2" +pkgrel="1" header="\ # Maintainer: Jesus Alvarez diff --git a/src/kernels/dkms.sh b/src/kernels/dkms.sh index 92617f4..c52d913 100644 --- a/src/kernels/dkms.sh +++ b/src/kernels/dkms.sh @@ -3,7 +3,7 @@ mode_name="dkms" mode_desc="Select and use the dkms packages" # version -pkgrel="3" +pkgrel="1" # Version for GIT packages pkgrel_git="${pkgrel}" diff --git a/src/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh index 786f76f..26ab846 100644 --- a/src/kernels/linux-hardened.sh +++ b/src/kernels/linux-hardened.sh @@ -4,7 +4,7 @@ mode_desc="Select and use the packages for the linux-hardened kernel" # Kernel versions for hardened packages pkgrel="1" -kernel_version="4.14.7.a-1" +kernel_version="4.14.8.b-1" # Kernel version for GIT packages pkgrel_git="${pkgrel}" diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh index bd7c38f..aa95666 100644 --- a/src/kernels/linux-lts.sh +++ b/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="2" +pkgrel="1" kernel_version="4.9.70-1" # Kernel version for GIT packages diff --git a/src/kernels/linux-vfio.sh b/src/kernels/linux-vfio.sh index ded29d9..1ff18e7 100644 --- a/src/kernels/linux-vfio.sh +++ b/src/kernels/linux-vfio.sh @@ -3,7 +3,7 @@ mode_name="vfio" mode_desc="Select and use the packages for the linux-vfio kernel" # Kernel versions for default ZFS packages -pkgrel="2" +pkgrel="1" kernel_version="4.13.12-2" # Kernel version for GIT packages diff --git a/src/kernels/linux-zen.sh b/src/kernels/linux-zen.sh index df885dd..b319c91 100644 --- a/src/kernels/linux-zen.sh +++ b/src/kernels/linux-zen.sh @@ -3,8 +3,8 @@ mode_name="zen" mode_desc="Select and use the packages for the linux-zen kernel" # Kernel versions for default ZFS packages -pkgrel="2" -kernel_version="4.14.6-1" +pkgrel="1" +kernel_version="4.14.7-1" # Kernel version for GIT packages pkgrel_git="${pkgrel}" diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh index 56658bc..3fcde8d 100644 --- a/src/kernels/linux.sh +++ b/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="2" -kernel_version="4.14.6-1" +pkgrel="1" +kernel_version="4.14.7-1" # Kernel version for GIT packages pkgrel_git="${pkgrel}" diff --git a/src/zfs-utils/PKGBUILD.sh b/src/zfs-utils/PKGBUILD.sh index 774ae74..9de3514 100755 --- a/src/zfs-utils/PKGBUILD.sh +++ b/src/zfs-utils/PKGBUILD.sh @@ -31,7 +31,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \\ --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \\ --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-${zol_version} \\ - --with-config=user --with-systemd + --with-config=user --enable-systemd make }