From 59d4135788020a8fa15fdde220ccf162db2acf5a Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Wed, 18 Jun 2014 12:35:49 -0700 Subject: [PATCH] Update git packages to kernel 3.15.1-1 --- conf.sh | 6 +++--- spl-git/PKGBUILD | 12 ++++++------ spl-git/spl.install | 4 ++-- spl-utils-git/PKGBUILD | 4 ++-- zfs-git/PKGBUILD | 12 ++++++------ zfs-git/zfs.install | 4 ++-- zfs-utils-git/PKGBUILD | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/conf.sh b/conf.sh index 609b230..af3fe95 100644 --- a/conf.sh +++ b/conf.sh @@ -2,10 +2,10 @@ AZB_ZOL_VERSION="0.6.3" # Kernel version for GIT packages -AZB_GIT_SPL_COMMIT="42dcd92c" +AZB_GIT_SPL_COMMIT="31cb5383" AZB_GIT_ZFS_COMMIT="07dabd23" -AZB_GIT_PKGREL="2" -AZB_GIT_KERNEL_VERSION="3.14.6" +AZB_GIT_PKGREL="1" +AZB_GIT_KERNEL_VERSION="3.15.1" AZB_GIT_KERNEL_X32_PKGREL="1" AZB_GIT_KERNEL_X64_PKGREL="1" AZB_GIT_KERNEL_X32_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X32_PKGREL}" diff --git a/spl-git/PKGBUILD b/spl-git/PKGBUILD index c3c1480..a3de800 100644 --- a/spl-git/PKGBUILD +++ b/spl-git/PKGBUILD @@ -8,17 +8,17 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="spl-git" -pkgver=0.6.2_r33_g89aa970_3.14.6_1 +pkgver=0.6.3_r0_g31cb538_3.15.1_1 pkgrel=1 license=('GPL') # Used incase the i686 and x86_64 linux packages get out of sync with the # PKGREL. This occurred on January 31, 2014 where i686 was versioned at # 3.12.9-1 and x86_64 was versioned at 3.12.9-2. -_kernel_version_x32="3.14.6-1" -_kernel_version_x32_full="3.14.6-1" -_kernel_version_x64="3.14.6-1" -_kernel_version_x64_full="3.14.6-1" +_kernel_version_x32="3.15.1-1" +_kernel_version_x32_full="3.15.1-1" +_kernel_version_x64="3.15.1-1" +_kernel_version_x64_full="3.15.1-1" if [[ $CARCH == "i686" ]]; then _kernel_version=${_kernel_version_x32} @@ -33,7 +33,7 @@ depends=("spl-utils-git" "linux=${_kernel_version}") makedepends=("git" "linux-headers=${_kernel_version}") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/spl.git#commit=89aa970") +source=("git+https://github.com/zfsonlinux/spl.git#commit=31cb5383") groups=("archzfs-git") md5sums=('SKIP') replaces=("spl") diff --git a/spl-git/spl.install b/spl-git/spl.install index 0d90751..2c14ecc 100644 --- a/spl-git/spl.install +++ b/spl-git/spl.install @@ -28,8 +28,8 @@ check_hostid() { run_depmod() { echo ">>> Updating module dependencies. Please wait ..." - _kernel_version_x32_full="3.14.6-1" - _kernel_version_x64_full="3.14.6-1" + _kernel_version_x32_full="3.15.1-1" + _kernel_version_x64_full="3.15.1-1" [[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full} diff --git a/spl-utils-git/PKGBUILD b/spl-utils-git/PKGBUILD index d38d8fe..8c99241 100644 --- a/spl-utils-git/PKGBUILD +++ b/spl-utils-git/PKGBUILD @@ -8,14 +8,14 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="spl-utils-git" -pkgver=0.6.2_r33_g89aa970_3.14.6_1 +pkgver=0.6.3_r0_g31cb538_3.15.1_1 pkgrel=1 license=('GPL') pkgdesc="Solaris Porting Layer kernel module support files." makedepends=("git") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/spl.git#commit=89aa970" +source=("git+https://github.com/zfsonlinux/spl.git#commit=31cb5383" "spl-utils.hostid") groups=("archzfs-git") md5sums=('SKIP' diff --git a/zfs-git/PKGBUILD b/zfs-git/PKGBUILD index 9678182..c9a81dc 100644 --- a/zfs-git/PKGBUILD +++ b/zfs-git/PKGBUILD @@ -8,17 +8,17 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="zfs-git" -pkgver=0.6.2_r258_g4fd762f_3.14.6_1 +pkgver=0.6.3_r0_g07dabd2_3.15.1_1 pkgrel=1 license=('CDDL') # Used incase the i686 and x86_64 linux packages get out of sync with the # PKGREL. This occurred on January 31, 2014 where i686 was versioned at # 3.12.9-1 and x86_64 was versioned at 3.12.9-2. -_kernel_version_x32="3.14.6-1" -_kernel_version_x32_full="3.14.6-1" -_kernel_version_x64="3.14.6-1" -_kernel_version_x64_full="3.14.6-1" +_kernel_version_x32="3.15.1-1" +_kernel_version_x32_full="3.15.1-1" +_kernel_version_x64="3.15.1-1" +_kernel_version_x64_full="3.15.1-1" if [[ $CARCH == "i686" ]]; then _kernel_version=${_kernel_version_x32} @@ -33,7 +33,7 @@ depends=("spl-git" "zfs-utils-git" "linux=${_kernel_version}") makedepends=("git" "linux-headers=${_kernel_version}") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git#commit=4fd762f") +source=("git+https://github.com/zfsonlinux/zfs.git#commit=07dabd23") groups=("archzfs-git") md5sums=('SKIP') replaces=("zfs") diff --git a/zfs-git/zfs.install b/zfs-git/zfs.install index 17a84cb..0a6398b 100644 --- a/zfs-git/zfs.install +++ b/zfs-git/zfs.install @@ -13,8 +13,8 @@ post_upgrade() { check_initramfs() { echo ">>> Updating module dependencies. Please wait ..." - _kernel_version_x32_full="3.14.6-1" - _kernel_version_x64_full="3.14.6-1" + _kernel_version_x32_full="3.15.1-1" + _kernel_version_x64_full="3.15.1-1" [[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full} diff --git a/zfs-utils-git/PKGBUILD b/zfs-utils-git/PKGBUILD index 0043b18..f408cb2 100644 --- a/zfs-utils-git/PKGBUILD +++ b/zfs-utils-git/PKGBUILD @@ -8,7 +8,7 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="zfs-utils-git" -pkgver=0.6.2_r258_g4fd762f_3.14.6_1 +pkgver=0.6.3_r0_g07dabd2_3.15.1_1 pkgrel=1 license=('CDDL') pkgdesc="Kernel module support files for the Zettabyte File System." @@ -16,7 +16,7 @@ depends=("spl-git") makedepends=("git") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git#commit=4fd762f" +source=("git+https://github.com/zfsonlinux/zfs.git#commit=07dabd23" "zfs-utils.bash-completion-r1" "zfs-utils.initcpio.install" "zfs-utils.initcpio.hook")