From 43635d2fa89d013bab3f8bea52ad9d5042568b82 Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Mon, 9 Apr 2018 22:57:31 +0200 Subject: [PATCH] 4.16.1-1 (clr 4.16.1-545) --- .SRCINFO | 18 +++++++++--------- PKGBUILD | 18 ++++++++---------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 975d708..65de69e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear - pkgver = 4.15.15 - pkgrel = 2 + pkgver = 4.16.1 + pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 @@ -12,11 +12,11 @@ pkgbase = linux-clear makedepends = linux-firmware makedepends = xmlto 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.15.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.15.sign - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.15.15-539 + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.1.sign + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.16.1-545 source = https://downloadmirror.intel.com/27591/eng/microcode-20180312.tgz source = 60-linux.hook source = 90-linux.hook @@ -24,9 +24,9 @@ pkgbase = linux-clear source = linux.preset validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 + sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 sha256sums = SKIP - sha256sums = d8e7f93e24db5517a1be2030a765431120e07f7cd55e510d0de562c70e45bc00 + sha256sums = 66931bd802eb8d9f09b1f36bb57f24abab13230469ee855e5aaa2f93be2022e0 sha256sums = SKIP sha256sums = SKIP sha256sums = 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779 diff --git a/PKGBUILD b/PKGBUILD index 96d73d9..ccb4baf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,11 +2,11 @@ # Contributor: pkgbase=linux-clear -__basekernel=4.15 -_minor=15 +__basekernel=4.16 +_minor=1 pkgver=${__basekernel}.${_minor} -_clearver=${__basekernel}.15-539 -pkgrel=2 +_clearver=${__basekernel}.1-545 +pkgrel=1 arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" license=('GPL2') @@ -28,9 +28,9 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' +sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'SKIP' - 'd8e7f93e24db5517a1be2030a765431120e07f7cd55e510d0de562c70e45bc00' + '66931bd802eb8d9f09b1f36bb57f24abab13230469ee855e5aaa2f93be2022e0' 'SKIP' 'SKIP' '0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779' @@ -53,7 +53,8 @@ prepare() { rm -f firmware/intel-ucode/0f* # Apply clearlinux patches - for i in $(grep "^Patch" ${srcdir}/clearlinux/linux.spec | grep -v 'zero-regs.patch' | sed -n 's/.*: //p'); do + for i in $(grep "^Patch" ${srcdir}/clearlinux/linux.spec | grep -v 'zero-regs.patch' |\ + grep -v '0115-raid6-add-Kconfig-option-to-skip-raid6-benchmarking.patch' | sed -n 's/.*: //p'); do msg "Applying ${i}" patch -p1 -i "$srcdir/clearlinux/${i}" done @@ -163,9 +164,6 @@ _package-headers() { install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h - # http://bugs.archlinux.org/task/9912 - install -Dt "${_builddir}/drivers/media/dvb-core" -m644 drivers/media/dvb-core/*.h - # http://bugs.archlinux.org/task/13146 install -Dt "${_builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h