Semi-automated update for 4.12.3_1-2

This commit is contained in:
Jesus Alvarez 2017-07-30 17:51:37 -07:00
parent 03613e36be
commit 494d90b5a2
3 changed files with 14 additions and 18 deletions

View File

@ -1,8 +1,8 @@
# Generated by mksrcinfo v8 # Generated by mksrcinfo v8
# Fri Jul 28 18:47:54 UTC 2017 # Sun Jul 30 23:16:28 UTC 2017
pkgbase = zfs-linux pkgbase = zfs-linux
pkgver = 0.7.0_4.12.3_1 pkgver = 0.7.0_4.12.3_1
pkgrel = 1 pkgrel = 2
url = http://zfsonlinux.org/ url = http://zfsonlinux.org/
arch = x86_64 arch = x86_64
license = CDDL license = CDDL
@ -10,7 +10,7 @@ pkgbase = zfs-linux
makedepends = spl-linux-headers makedepends = spl-linux-headers
depends = kmod depends = kmod
depends = spl-linux depends = spl-linux
depends = zfs-utils-common depends = zfs-utils-common>=0.7.0
depends = linux=4.12.3-1 depends = linux=4.12.3-1
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz
sha256sums = 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 sha256sums = 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2
@ -25,9 +25,10 @@ pkgname = zfs-linux
pkgname = zfs-linux-headers pkgname = zfs-linux-headers
pkgdesc = Kernel headers for the Zettabyte File System. pkgdesc = Kernel headers for the Zettabyte File System.
conflicts = zfs-linux-git-headers conflicts = zfs-archiso-linux-headers
conflicts = zfs-linux-lts-headers
conflicts = zfs-linux-lts-git-headers
conflicts = zfs-linux-hardened-headers conflicts = zfs-linux-hardened-headers
conflicts = zfs-linux-hardened-git-headers conflicts = zfs-linux-hardened-git-headers
conflicts = zfs-linux-lts-headers
conflicts = zfs-linux-lts-git-headers
conflicts = zfs-linux-git-headers

View File

@ -17,14 +17,14 @@
pkgbase="zfs-linux" pkgbase="zfs-linux"
pkgname=("zfs-linux" "zfs-linux-headers") pkgname=("zfs-linux" "zfs-linux-headers")
pkgver=0.7.0_4.12.3_1 pkgver=0.7.0_4.12.3_1
pkgrel=1 pkgrel=2
makedepends=("linux-headers=4.12.3-1" "spl-linux-headers") makedepends=("linux-headers=4.12.3-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.0/zfs-0.7.0.tar.gz") source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz")
sha256sums=("6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2") sha256sums=("6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2")
license=("CDDL") license=("CDDL")
depends=("kmod" "spl-linux" "zfs-utils-common" "linux=4.12.3-1") depends=("kmod" "spl-linux" "zfs-utils-common>=0.7.0" "linux=4.12.3-1")
build() { build() {
cd "${srcdir}/zfs-0.7.0" cd "${srcdir}/zfs-0.7.0"
@ -54,7 +54,7 @@ package_zfs-linux() {
package_zfs-linux-headers() { package_zfs-linux-headers() {
pkgdesc="Kernel headers for the Zettabyte File System." 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') conflicts=('zfs-archiso-linux-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-git-headers' )
cd "${srcdir}/zfs-0.7.0" cd "${srcdir}/zfs-0.7.0"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib" rm -r "${pkgdir}/lib"

View File

@ -14,14 +14,9 @@ check_initramfs() {
echo ">>> Updating ZFS module dependencies" echo ">>> Updating ZFS module dependencies"
depmod -a 4.12.3-1-ARCH depmod -a 4.12.3-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' && $1 == 'remove' ]]; then
if [[ $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"' echo '>>> list in mkinitcpio.conf! You will need to remove "zfs" from the '
echo '>>> list in mkinitcpio.conf! You will need to remove "zfs" from the ' echo '>>> "hooks" list and then regenerate the initial ramdisk.'
echo '>>> "hooks" list and then regenerate the initial ramdisk.'
else
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux
fi
fi fi
} }