marcel/zfs-linux
1
0
Fork 0
mirror of https://aur.archlinux.org/zfs-linux.git synced 2025-06-03 06:07:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Semi-automated update for kernel 4.18.5.arch1-1 + zfs 0.7.9

Browse Source
This commit is contained in:
Archzfs Buildbot 2018-08-26 19:02:55 +00:00
parent b1de99be41
commit 4a8b343bc9
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.SRCINFO
View File

@ -1,15 +1,15 @@
pkgbase = zfs-linux pkgbase = zfs-linux
pkgver = 0.7.9.4.18.4.arch1.1 pkgver = 0.7.9.4.18.5.arch1.1
pkgrel = 2 pkgrel = 2
url = http://zfsonlinux.org/ url = http://zfsonlinux.org/
arch = x86_64 arch = x86_64
license = CDDL license = CDDL
makedepends = linux-headers=4.18.4.arch1-1 makedepends = linux-headers=4.18.5.arch1-1
makedepends = spl-linux-headers makedepends = spl-linux-headers
depends = kmod depends = kmod
depends = spl-linux depends = spl-linux
depends = zfs-utils-common=0.7.9 depends = zfs-utils-common=0.7.9
depends = linux=4.18.4.arch1-1 depends = linux=4.18.5.arch1-1
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz
source = upstream-ac09630-Fix-zpl_mount-deadlock.patch source = upstream-ac09630-Fix-zpl_mount-deadlock.patch
source = upstream-9f64c1e-Linux-4.18-compat-inode-timespec_timespec64.patch source = upstream-9f64c1e-Linux-4.18-compat-inode-timespec_timespec64.patch

12
PKGBUILD
View File

@ -19,9 +19,9 @@
pkgbase="zfs-linux" pkgbase="zfs-linux"
pkgname=("zfs-linux" "zfs-linux-headers") pkgname=("zfs-linux" "zfs-linux-headers")
pkgver=0.7.9.4.18.4.arch1.1 pkgver=0.7.9.4.18.5.arch1.1
pkgrel=2 pkgrel=2
makedepends=("linux-headers=4.18.4.arch1-1" "spl-linux-headers") makedepends=("linux-headers=4.18.5.arch1-1" "spl-linux-headers")
arch=("x86_64") arch=("x86_64")
url="http://zfsonlinux.org/" url="http://zfsonlinux.org/"
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz" source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz"
@ -33,7 +33,7 @@ sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a"
"03ed45af40850c3a51a6fd14f36c1adc06501c688a67afb13db4fded6ec9db1d" "03ed45af40850c3a51a6fd14f36c1adc06501c688a67afb13db4fded6ec9db1d"
"afbde4a2507dff989404665dbbdfe18eecf5aba716a6513902affa0e4cb033fe") "afbde4a2507dff989404665dbbdfe18eecf5aba716a6513902affa0e4cb033fe")
license=("CDDL") license=("CDDL")
depends=("kmod" 'spl-linux' "zfs-utils-common=0.7.9" "linux=4.18.4.arch1-1") depends=("kmod" 'spl-linux' "zfs-utils-common=0.7.9" "linux=4.18.5.arch1-1")
prepare() { prepare() {
cd "${srcdir}/zfs-0.7.9" cd "${srcdir}/zfs-0.7.9"
patch -Np1 -i ${srcdir}/upstream-ac09630-Fix-zpl_mount-deadlock.patch patch -Np1 -i ${srcdir}/upstream-ac09630-Fix-zpl_mount-deadlock.patch
@ -47,8 +47,8 @@ build() {
./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.7.9 --with-config=kernel \ --libexecdir=/usr/lib/zfs-0.7.9 --with-config=kernel \
--with-linux=/usr/lib/modules/4.18.4-arch1-1-ARCH/build \ --with-linux=/usr/lib/modules/4.18.5-arch1-1-ARCH/build \
--with-linux-obj=/usr/lib/modules/4.18.4-arch1-1-ARCH/build --with-linux-obj=/usr/lib/modules/4.18.5-arch1-1-ARCH/build
make make
} }
@ -74,5 +74,5 @@ package_zfs-linux-headers() {
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib" rm -r "${pkgdir}/lib"
# Remove reference to ${srcdir} # Remove reference to ${srcdir}
sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.18.4-arch1-1-ARCH/Module.symvers sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.18.5-arch1-1-ARCH/Module.symvers
} }

2
zfs.install
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.18.4-arch1-1-ARCH depmod -a 4.18.5-arch1-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' && $1 == 'remove' ]]; then if [[ ${MK_CONF} == '0' && $1 == 'remove' ]]; then
echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"' echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'