summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2017-12-07 13:17:13 -0500
committergraysky2017-12-07 13:17:13 -0500
commite88edacf293c890119682657d52e9e9460f63231 (patch)
tree633f4eef8753fbd3872dcb3496c5348bd3a73c47
parent005bf95f113297f6224d6d661bddf685a0725e49 (diff)
downloadaur-e88edacf293c890119682657d52e9e9460f63231.tar.gz
Update to 4.14.4-1
-rw-r--r--.SRCINFO18
-rw-r--r--0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch38
-rw-r--r--PKGBUILD9
3 files changed, 10 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a1d42640d3..8e8e9447e7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Thu Nov 30 19:59:28 UTC 2017
+# Thu Dec 7 18:17:13 UTC 2017
pkgbase = linux-ck
- pkgver = 4.14.3
+ pkgver = 4.14.4
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -13,15 +13,14 @@ pkgbase = linux-ck
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.3.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.3.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.4.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.4.sign
source = config
source = 60-linux.hook
source = 90-linux.hook
source = linux.preset
source = enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch
source = http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz
- source = 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
source = https://github.com/ckolivas/linux/pull/7/commits/811cb391e71c1d60387dbbd6ae0bbc4e61f06acb.patch
source = https://github.com/ckolivas/linux/pull/7/commits/6bfb805cbac27b18fb4ad7537fe90dfc39e17f35.patch
source = https://github.com/ckolivas/linux/pull/7/commits/1588e6bf316231685204e358dfe172851b39fd1e.patch
@@ -29,7 +28,7 @@ pkgbase = linux-ck
source = https://github.com/ckolivas/linux/pull/7/commits/a79d648fcde72fc98048d4435bc86864a59fd01b.patch
sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
sha256sums = SKIP
- sha256sums = e13995c11d0c2d3379c887666dbfaca619200fb8853db6d5d67f97d47fd959b7
+ sha256sums = e9dcf9aad5977289940cd6e3762af02b87a725ba6c1a9f4af86958dc621e3a84
sha256sums = SKIP
sha256sums = 8cb75d76f7923723591bbcca72f98f362ca1e47b8418118142fb1fa9481b0b33
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
@@ -37,7 +36,6 @@ pkgbase = linux-ck
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = 8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8
sha256sums = 44d10c573112dc2b64d39ea33c2a10fbbdd84f9877b8d736acc09b2516299474
- sha256sums = 6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd
sha256sums = 24b74a975e61293cdd4ce37845a27f550102b0481017336e15df3334a82cef02
sha256sums = 453ccb01d9e56ea3a33621516f0d52568e836d1932ff14e26567cc3fe2101a17
sha256sums = d2f59cf1c5187204eced6e53806b187e90698fcb2309955aed4020a15c659ae1
@@ -52,12 +50,12 @@ pkgname = linux-ck
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = linux-ck=4.14.3
+ provides = linux-ck=4.14.4
backup = etc/mkinitcpio.d/linux-ck.preset
pkgname = linux-ck-headers
pkgdesc = Header files and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=4.14.3
- provides = linux-headers=4.14.3
+ provides = linux-ck-headers=4.14.4
+ provides = linux-headers=4.14.4
diff --git a/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch b/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
deleted file mode 100644
index bb85169ae04..00000000000
--- a/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 34bc85a1577be5f2f6ccd2c17fc5870c83ab510b Mon Sep 17 00:00:00 2001
-Message-Id: <34bc85a1577be5f2f6ccd2c17fc5870c83ab510b.1510965801.git.jan.steffens@gmail.com>
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Fri, 3 Nov 2017 03:01:53 +0100
-Subject: [PATCH] platform/x86: hp-wmi: Fix tablet mode detection for
- convertibles
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet
-state fetchers") consolidated the methods for docking and laptop mode
-detection, but omitted to apply the correct mask for the laptop mode
-(it always uses the constant for docking).
-
-Fixes: f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet state fetchers")
-Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
----
- drivers/platform/x86/hp-wmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
-index b4ed3dc983d5229c..b4224389febebe46 100644
---- a/drivers/platform/x86/hp-wmi.c
-+++ b/drivers/platform/x86/hp-wmi.c
-@@ -297,7 +297,7 @@ static int hp_wmi_hw_state(int mask)
- if (state < 0)
- return state;
-
-- return state & 0x1;
-+ return !!(state & mask);
- }
-
- static int __init hp_wmi_bios_2008_later(void)
---
-2.15.0
-
diff --git a/PKGBUILD b/PKGBUILD
index c052daf5c0f..fc1a36d2a7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,7 +39,7 @@ _use_current=
pkgbase=linux-ck
_srcname=linux-4.14
-pkgver=4.14.3
+pkgver=4.14.4
pkgrel=1
_ckpatchversion=1
arch=('x86_64')
@@ -61,7 +61,6 @@ source=(
'linux.preset' # standard config files for mkinitcpio ramdisk
"$_gcc_patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch"
"http://ck.kolivas.org/patches/4.0/4.14/4.14-ck${_ckpatchversion}/${_ckpatchname}.xz"
- '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch'
# pre ck2 patches
"$_preck2/811cb391e71c1d60387dbbd6ae0bbc4e61f06acb.patch"
"$_preck2/6bfb805cbac27b18fb4ad7537fe90dfc39e17f35.patch"
@@ -75,7 +74,7 @@ validpgpkeys=(
)
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'SKIP'
- 'e13995c11d0c2d3379c887666dbfaca619200fb8853db6d5d67f97d47fd959b7'
+ 'e9dcf9aad5977289940cd6e3762af02b87a725ba6c1a9f4af86958dc621e3a84'
'SKIP'
'8cb75d76f7923723591bbcca72f98f362ca1e47b8418118142fb1fa9481b0b33'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -83,7 +82,6 @@ sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8'
'44d10c573112dc2b64d39ea33c2a10fbbdd84f9877b8d736acc09b2516299474'
- '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd'
'24b74a975e61293cdd4ce37845a27f550102b0481017336e15df3334a82cef02'
'453ccb01d9e56ea3a33621516f0d52568e836d1932ff14e26567cc3fe2101a17'
'd2f59cf1c5187204eced6e53806b187e90698fcb2309955aed4020a15c659ae1'
@@ -109,9 +107,6 @@ prepare() {
patch -Np1 -i ../df2a75f4864b30011ab6a6f365d9378d8eafa53b.patch
patch -Np1 -i ../a79d648fcde72fc98048d4435bc86864a59fd01b.patch
- # https://bugs.archlinux.org/task/56207
- patch -Np1 -i ../0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
-
# Patch source to unlock additional gcc CPU optimizatons
# https://github.com/graysky2/kernel_gcc_patch
patch -Np1 -i "../${_gcc_patch}"