summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorgraysky2018-05-26 11:28:29 -0400
committergraysky2018-05-26 11:28:29 -0400
commite4ebd60d939f7cabac925899a1c6f889959ea436 (patch)
tree5cc1da82383b6ee4f63eb7ef21f516c395d2bcd1 /PKGBUILD
parent3057a79d25c7934a4fe32cff20115d86b7230227 (diff)
downloadaur-e4ebd60d939f7cabac925899a1c6f889959ea436.tar.gz
Update to 4.16.12-2
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD18
1 files changed, 11 insertions, 7 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 42ac950f512..bd273ff8524 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -67,7 +67,7 @@ _localmodcfg=
pkgbase=linux-ck
_srcname=linux-4.16
pkgver=4.16.12
-pkgrel=1
+pkgrel=2
_ckpatchversion=1
arch=('x86_64')
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -87,7 +87,8 @@ source=(
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" # enable_additional_cpu_optimizations_for_gcc
"http://ck.kolivas.org/patches/4.0/4.16/4.16-ck${_ckpatchversion}/${_ckpatchname}.xz"
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+ 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
+ 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -103,8 +104,9 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
'61cd4b129eac475ad82fcdbbf9952b80e81e7c893776c00e3b6a658b950d0b26'
- '63547739f0c0d36a1e6ab24eeb0bb86b2adb1dce688c60f0969fa95fd16cc123'
- 'd098aa90b48588059204ff2a1f37669e5a932b1fa7616bd36fe97092a15c8928')
+ '8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd'
+ '2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446'
+ '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
@@ -121,8 +123,11 @@ prepare() {
# disable USER_NS for non-root users by default
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+ # https://bugs.archlinux.org/task/56780
+ patch -Np1 -i ../0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
+
# https://bugs.archlinux.org/task/56711
- patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+ patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
# fix naming schema in EXTRAVERSION of ck patch set
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatchname}"
@@ -147,8 +152,7 @@ END
-e "/^EXTRAVERSION =/aLOCALVERSION =" \
-i Makefile
- ### Optionally disable NUMA for 64-bit kernels only
- # (x86 kernels do not support NUMA)
+ ### Optionally disable NUMA
if [ -n "$_NUMAdisable" ]; then
msg "Disabling NUMA from kernel config..."
sed -i -e 's/CONFIG_NUMA=y/# CONFIG_NUMA is not set/' \