From b1422fb0dba8efd6b7359c0d8d74610acc27c7a1 Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Thu, 15 Mar 2018 21:59:53 +0100 Subject: [PATCH] 4.15.10-1 (clr 4.15.9-537) --- .SRCINFO | 12 ++++++------ PKGBUILD | 12 +++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f01df7f..97ac2d1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear - pkgver = 4.15.9 - pkgrel = 2 + pkgver = 4.15.10 + pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 @@ -14,9 +14,9 @@ pkgbase = linux-clear options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.9.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.9.sign - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.15.7-536 + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.10.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.10.sign + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.15.9-537 source = https://downloadmirror.intel.com/27591/eng/microcode-20180312.tgz source = 60-linux.hook source = 90-linux.hook @@ -26,7 +26,7 @@ pkgbase = linux-clear validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 sha256sums = SKIP - sha256sums = f3070554bd5f1640085cc35ae2f4bc23a94f9cf47b562140e5c2ec9a16d6b52e + sha256sums = bbc4e9dc11c15493bd74bf1aae76741ea0e170bc3a07ba9489048bdc9ff85671 sha256sums = SKIP sha256sums = SKIP sha256sums = 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779 diff --git a/PKGBUILD b/PKGBUILD index c9e0fcd..7ae670b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,10 +3,10 @@ pkgbase=linux-clear __basekernel=4.15 -_minor=9 +_minor=10 pkgver=${__basekernel}.${_minor} -_clearver=${__basekernel}.7-536 -pkgrel=2 +_clearver=${__basekernel}.9-537 +pkgrel=1 arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" license=('GPL2') @@ -30,7 +30,7 @@ validpgpkeys=( ) sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - 'f3070554bd5f1640085cc35ae2f4bc23a94f9cf47b562140e5c2ec9a16d6b52e' + 'bbc4e9dc11c15493bd74bf1aae76741ea0e170bc3a07ba9489048bdc9ff85671' 'SKIP' 'SKIP' '0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779' @@ -53,7 +53,9 @@ prepare() { rm -f firmware/intel-ucode/0f* # Apply clearlinux patches - for i in $(grep "^Patch" ${srcdir}/clearlinux/linux.spec | sed -n 's/.*: //p'); do + for i in $(grep "^Patch" ${srcdir}/clearlinux/linux.spec |\ + grep -v '0001-drm-i915-Update-watermark-state-correctly-in-sanitiz.patch' |\ + grep -v 'zero-regs.patch' | sed -n 's/.*: //p'); do msg "Applying ${i}" patch -p1 -i "$srcdir/clearlinux/${i}" done