Semi-automated update for 4.11.9_1-1

This commit is contained in:
Jesus Alvarez 2017-07-28 02:47:04 -07:00
parent 25fac2c143
commit 0d418c16a2
3 changed files with 54 additions and 35 deletions

View File

@ -1,25 +1,33 @@
# Generated by mksrcinfo v8 # Generated by mksrcinfo v8
# Mon May 1 14:05:52 UTC 2017 # Fri Jul 28 09:10:18 UTC 2017
pkgbase = zfs-linux pkgbase = zfs-linux
pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 0.7.0_4.11.9_1
pkgver = 0.6.5.9_4.10.13_1
pkgrel = 1 pkgrel = 1
url = http://zfsonlinux.org/ url = http://zfsonlinux.org/
install = zfs.install
arch = x86_64 arch = x86_64
groups = archzfs-linux
license = CDDL license = CDDL
makedepends = linux-headers=4.10.13-1 makedepends = linux-headers=4.11.9-1
makedepends = spl-linux-headers
depends = kmod depends = kmod
depends = spl-linux depends = spl-linux
depends = zfs-utils-linux depends = zfs-utils-common
depends = linux=4.10.13-1 depends = linux=4.11.9-1
provides = zfs source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz
conflicts = zfs-linux-git sha256sums = 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2
conflicts = zfs-linux-lts
replaces = zfs-git
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.9/zfs-0.6.5.9.tar.gz
sha256sums = b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f
pkgname = zfs-linux pkgname = zfs-linux
pkgdesc = Kernel modules for the Zettabyte File System.
install = zfs.install
groups = archzfs-linux
provides = zfs
conflicts = zfs-linux-git
replaces = zfs-git
pkgname = zfs-linux-headers
pkgdesc = Kernel headers for the Zettabyte File System.
conflicts = zfs-linux-git-headers
conflicts = zfs-linux-lts-headers
conflicts = zfs-linux-lts-git-headers
conflicts = zfs-linux-hardened-headers
conflicts = zfs-linux-hardened-git-headers

View File

@ -14,39 +14,50 @@
# packages for your favorite kernel package built using the archzfs build tools, submit a request in the Issue tracker on the # packages for your favorite kernel package built using the archzfs build tools, submit a request in the Issue tracker on the
# archzfs github page. # archzfs github page.
# #
pkgname="zfs-linux" pkgbase="zfs-linux"
pkgver=0.6.5.9_4.10.13_1 pkgname=("zfs-linux" "zfs-linux-headers")
pkgver=0.7.0_4.11.9_1
pkgrel=1 pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System." makedepends=("linux-headers=4.11.9-1" "spl-linux-headers")
depends=("kmod" "spl-linux" "zfs-utils-linux" "linux=4.10.13-1")
makedepends=("linux-headers=4.10.13-1")
arch=("x86_64") arch=("x86_64")
url="http://zfsonlinux.org/" url="http://zfsonlinux.org/"
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.9/zfs-0.6.5.9.tar.gz") source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz")
sha256sums=("b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f") sha256sums=("6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2")
groups=("archzfs-linux")
license=("CDDL") license=("CDDL")
install=zfs.install depends=("kmod" "spl-linux" "zfs-utils-common" "linux=4.11.9-1")
provides=("zfs")
conflicts=('zfs-linux-git' 'zfs-linux-lts')
replaces=("zfs-git")
build() { build() {
cd "${srcdir}/zfs-0.6.5.9" cd "${srcdir}/zfs-0.7.0"
./autogen.sh ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
--datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \ --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \
--libexecdir=/usr/lib/zfs-0.6.5.9 --with-config=kernel \ --libexecdir=/usr/lib/zfs-0.7.0 --with-config=kernel \
--with-linux=/usr/lib/modules/4.10.13-1-ARCH/build \ --with-linux=/usr/lib/modules/4.11.9-1-ARCH/build \
--with-linux-obj=/usr/lib/modules/4.10.13-1-ARCH/build --with-linux-obj=/usr/lib/modules/4.11.9-1-ARCH/build
make make
} }
package() { package_zfs-linux() {
cd "${srcdir}/zfs-0.6.5.9" pkgdesc="Kernel modules for the Zettabyte File System."
install=zfs.install
provides=("zfs")
groups=("archzfs-linux")
conflicts=('zfs-linux-git')
replaces=("zfs-git")
cd "${srcdir}/zfs-0.7.0"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
cp -r "${pkgdir}"/{lib,usr} cp -r "${pkgdir}"/{lib,usr}
rm -r "${pkgdir}"/lib rm -r "${pkgdir}"/lib
# Remove reference to ${srcdir} # Remove src dir
sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.10.13-1-ARCH/Module.symvers rm -r "${pkgdir}"/usr/src
}
package_zfs-linux-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
conflicts=('zfs-linux-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers')
cd "${srcdir}/zfs-0.7.0"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"
# Remove reference to ${srcdir}
sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.11.9-1-ARCH/Module.symvers
} }

View File

@ -12,7 +12,7 @@ post_upgrade() {
check_initramfs() { check_initramfs() {
echo ">>> Updating ZFS module dependencies" echo ">>> Updating ZFS module dependencies"
depmod -a 4.10.13-1-ARCH depmod -a 4.11.9-1-ARCH
MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?); MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
if [[ ${MK_CONF} == '0' ]]; then if [[ ${MK_CONF} == '0' ]]; then
if [[ $1 == 'remove' ]]; then if [[ $1 == 'remove' ]]; then