From 1ae371a17407274176dc69346df34f708f718795 Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Fri, 13 Jun 2014 00:37:33 -0700 Subject: [PATCH] Update lts packages to ZOL version 0.6.3 --- conf.sh | 10 +++++----- spl-lts/PKGBUILD | 12 ++++++------ spl-utils-lts/PKGBUILD | 12 ++++++------ zfs-lts/PKGBUILD | 14 +++++++------- zfs-utils-lts/PKGBUILD | 22 ++++++++-------------- 5 files changed, 32 insertions(+), 38 deletions(-) diff --git a/conf.sh b/conf.sh index 751a8d4..357eaec 100644 --- a/conf.sh +++ b/conf.sh @@ -1,10 +1,10 @@ # ZFSonLinux stable version (LTS packages) -AZB_ZOL_VERSION="0.6.2" +AZB_ZOL_VERSION="0.6.3" # Kernel version for GIT packages -AZB_GIT_SPL_COMMIT="89aa970" -AZB_GIT_ZFS_COMMIT="4fd762f" -AZB_GIT_PKGREL="1" +AZB_GIT_SPL_COMMIT="42dcd92c" +AZB_GIT_ZFS_COMMIT="07dabd23" +AZB_GIT_PKGREL="2" AZB_GIT_KERNEL_VERSION="3.14.6" AZB_GIT_KERNEL_X32_PKGREL="1" AZB_GIT_KERNEL_X64_PKGREL="1" @@ -12,7 +12,7 @@ AZB_GIT_KERNEL_X32_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X32_PKGRE AZB_GIT_KERNEL_X64_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X64_PKGREL}" # Kernel versions for LTS packages -AZB_LTS_PKGREL="1" +AZB_LTS_PKGREL="2" AZB_LTS_KERNEL_VERSION="3.10.42" AZB_LTS_KERNEL_X32_PKGREL="1" AZB_LTS_KERNEL_X64_PKGREL="1" diff --git a/spl-lts/PKGBUILD b/spl-lts/PKGBUILD index 6a73554..fc7dfaf 100644 --- a/spl-lts/PKGBUILD +++ b/spl-lts/PKGBUILD @@ -8,8 +8,8 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="spl-lts" -pkgver=0.6.2_3.10.42 -pkgrel=1 +pkgver=0.6.3_3.10.42 +pkgrel=2 # 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 @@ -32,16 +32,16 @@ depends=("spl-utils-lts" "linux-lts=${_kernel_version}") makedepends=("linux-lts-headers=${_kernel_version}") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz") +source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.3.tar.gz") groups=("archzfs-lts") -md5sums=('f00535bf89a7fde0e08f44a14a1f1e03') +md5sums=('8df6ce3c8f1d9af6526b36f5079cba59') license=("GPL") install=spl.install provides=("spl") conflicts=("spl" "spl-git") build() { - cd "${srcdir}/spl-0.6.2" + cd "${srcdir}/spl-0.6.3" ./autogen.sh _at_enable="" @@ -58,7 +58,7 @@ build() { } package() { - cd "${srcdir}/spl-0.6.2" + cd "${srcdir}/spl-0.6.3" make DESTDIR="${pkgdir}" install mv "${pkgdir}/lib" "${pkgdir}/usr/" diff --git a/spl-utils-lts/PKGBUILD b/spl-utils-lts/PKGBUILD index 14ab0f7..1958794 100644 --- a/spl-utils-lts/PKGBUILD +++ b/spl-utils-lts/PKGBUILD @@ -8,22 +8,22 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="spl-utils-lts" -pkgver=0.6.2_3.10.42 -pkgrel=1 +pkgver=0.6.3_3.10.42 +pkgrel=2 pkgdesc="Solaris Porting Layer kernel module support files." arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz" +source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.3.tar.gz" "spl-utils.hostid") groups=("archzfs-lts") -md5sums=('f00535bf89a7fde0e08f44a14a1f1e03' +md5sums=('8df6ce3c8f1d9af6526b36f5079cba59' 'a54f0041a9e15b050f25c463f1db7449') license=("GPL") provides=("spl-utils") conflicts=("spl-utils" "spl-utils-git") build() { - cd "${srcdir}/spl-0.6.2" + cd "${srcdir}/spl-0.6.3" ./autogen.sh _at_enable="" @@ -39,7 +39,7 @@ build() { } package() { - cd "${srcdir}/spl-0.6.2" + cd "${srcdir}/spl-0.6.3" make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}"/spl-utils.hostid "${pkgdir}"/etc/hostid diff --git a/zfs-lts/PKGBUILD b/zfs-lts/PKGBUILD index a1c9e22..1507b6c 100644 --- a/zfs-lts/PKGBUILD +++ b/zfs-lts/PKGBUILD @@ -9,8 +9,8 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="zfs-lts" -pkgver=0.6.2_3.10.42 -pkgrel=1 +pkgver=0.6.3_3.10.42 +pkgrel=2 # 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 @@ -33,16 +33,16 @@ depends=("spl-lts" "zfs-utils-lts" "linux-lts=${_kernel_version}") makedepends=("linux-lts-headers=${_kernel_version}") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz") +source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.3.tar.gz") groups=("archzfs-lts") -md5sums=('0b183b0abdd5be287046ad9ce4f899fd') +md5sums=('5bcc32c122934d421eba68e16826637d') license=("CDDL") install=zfs.install provides=("zfs") conflicts=("zfs" "zfs-git") build() { - cd "${srcdir}/zfs-0.6.2" + cd "${srcdir}/zfs-0.6.3" ./autogen.sh ./configure --prefix=/usr \ @@ -52,7 +52,7 @@ build() { --datadir=/usr/share \ --includedir=/usr/include \ --with-udevdir=/lib/udev \ - --libexecdir=/usr/lib/zfs-0.6.2 \ + --libexecdir=/usr/lib/zfs-0.6.3 \ --with-config=kernel \ --with-linux=/usr/lib/modules/${_kernel_version_full}-lts/build @@ -60,7 +60,7 @@ build() { } package() { - cd "${srcdir}/zfs-0.6.2" + cd "${srcdir}/zfs-0.6.3" make DESTDIR="${pkgdir}" install cp -r "$pkgdir"/{lib,usr} diff --git a/zfs-utils-lts/PKGBUILD b/zfs-utils-lts/PKGBUILD index 5a1b1f9..cccadf8 100644 --- a/zfs-utils-lts/PKGBUILD +++ b/zfs-utils-lts/PKGBUILD @@ -8,34 +8,28 @@ # The build script generates and updates the pkgver and _kernel* variables. # pkgname="zfs-utils-lts" -pkgver=0.6.2_3.10.42 -pkgrel=1 +pkgver=0.6.3_3.10.42 +pkgrel=2 pkgdesc="Kernel module support files for the Zettabyte File System." depends=("spl-lts") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz" +source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.3.tar.gz" "zfs-utils.bash-completion-r1" "zfs-utils.initcpio.install" "zfs-utils.initcpio.hook" ) -md5sums=('0b183b0abdd5be287046ad9ce4f899fd' +md5sums=('5bcc32c122934d421eba68e16826637d' '9ddb0c8a94861f929d0fa741fdc49950' 'd36549e6e04d817051d50c3636f21132' - 'ffa2220e660198eaf404daa937394973' - 'ccabc291d08b72369d50311ed77b63a8' - '8b57107ae89c4bc2aea6a7f6ab967e4e' - '9a827c675f00753a63459aaef23c4d78' - 'c6b9d62ad2c5ef6216b4c674a230c5f3' - '33aa777e7d6bd3e3008a10e3a7667f69' - '25bab2b91793928591d3830cd32f6077') + 'ffa2220e660198eaf404daa937394973') license=("CDDL") groups=("archzfs-lts") provides=("zfs-utils") conflicts=("zfs-utils" "zfs-utils-git") build() { - cd "${srcdir}/zfs-0.6.2" + cd "${srcdir}/zfs-0.6.3" ./autogen.sh ./configure --prefix=/usr \ @@ -45,13 +39,13 @@ build() { --datadir=/usr/share \ --includedir=/usr/include \ --with-udevdir=/lib/udev \ - --libexecdir=/usr/lib/zfs-0.6.2 \ + --libexecdir=/usr/lib/zfs-0.6.3 \ --with-config=user make } package() { - cd "${srcdir}/zfs-0.6.2" + cd "${srcdir}/zfs-0.6.3" make DESTDIR="${pkgdir}" install # Remove uneeded files