mirror of
https://aur.archlinux.org/zfs-linux.git
synced 2025-06-06 07:37:23 +02:00
Semi-automated update for kernel 4.17.11-1 + zfs 0.7.9
This commit is contained in:
parent
c7fac59a6a
commit
a37002a536
6
.SRCINFO
6
.SRCINFO
@ -1,15 +1,15 @@
|
|||||||
pkgbase = zfs-linux
|
pkgbase = zfs-linux
|
||||||
pkgver = 0.7.9.4.17.10.1
|
pkgver = 0.7.9.4.17.11.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.17.10-1
|
makedepends = linux-headers=4.17.11-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.17.10-1
|
depends = linux=4.17.11-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
|
||||||
sha256sums = f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a
|
sha256sums = f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a
|
||||||
|
12
PKGBUILD
12
PKGBUILD
@ -19,15 +19,15 @@
|
|||||||
pkgbase="zfs-linux"
|
pkgbase="zfs-linux"
|
||||||
pkgname=("zfs-linux" "zfs-linux-headers")
|
pkgname=("zfs-linux" "zfs-linux-headers")
|
||||||
|
|
||||||
pkgver=0.7.9.4.17.10.1
|
pkgver=0.7.9.4.17.11.1
|
||||||
pkgrel=2
|
pkgrel=2
|
||||||
makedepends=("linux-headers=4.17.10-1" "spl-linux-headers")
|
makedepends=("linux-headers=4.17.11-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" "upstream-ac09630-Fix-zpl_mount-deadlock.patch")
|
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz" "upstream-ac09630-Fix-zpl_mount-deadlock.patch")
|
||||||
sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a" "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8")
|
sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a" "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8")
|
||||||
license=("CDDL")
|
license=("CDDL")
|
||||||
depends=("kmod" 'spl-linux' "zfs-utils-common=0.7.9" "linux=4.17.10-1")
|
depends=("kmod" 'spl-linux' "zfs-utils-common=0.7.9" "linux=4.17.11-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
|
||||||
@ -39,8 +39,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.17.10-1-ARCH/build \
|
--with-linux=/usr/lib/modules/4.17.11-arch1/build \
|
||||||
--with-linux-obj=/usr/lib/modules/4.17.10-1-ARCH/build
|
--with-linux-obj=/usr/lib/modules/4.17.11-arch1/build
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,5 +66,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.17.10-1-ARCH/Module.symvers
|
sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.17.11-arch1/Module.symvers
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ post_upgrade() {
|
|||||||
|
|
||||||
check_initramfs() {
|
check_initramfs() {
|
||||||
echo ">>> Updating ZFS module dependencies"
|
echo ">>> Updating ZFS module dependencies"
|
||||||
depmod -a 4.17.10-1-ARCH
|
depmod -a 4.17.11-arch1
|
||||||
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"'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user