diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch | 38 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
3 files changed, 7 insertions, 52 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-xanmod - pkgver = 4.14.3 + pkgver = 4.14.4 pkgrel = 1 url = http://www.xanmod.org/ arch = x86_64 @@ -10,18 +10,16 @@ pkgbase = linux-xanmod makedepends = bc makedepends = libelf options = !strip - source = https://github.com/xanmod/linux/archive/4.14.3-xanmod6.tar.gz + source = https://github.com/xanmod/linux/archive/4.14.4-xanmod7_rev2.tar.gz source = 60-linux.hook source = 90-linux.hook source = linux-xanmod.preset source = choose-gcc-optimization.sh - source = 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch - sha256sums = 7d2e9078dd0eb8ccf1c51c6eba658a3cb28be986019cb349ccdec05d5666fc18 + sha256sums = f56ee8557166ae70db67788f57ff97d666935085d17c36e667ddc0e07b37674e sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 9fd3abfb3e5e6afd5b8476e30af4d7ded762f3da2a724133cb3f26ad21c31e54 - sha256sums = 6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd source_x86_64 = config::https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=8aee2fcbaf3fe676199bde199f9074e90f736681 sha256sums_x86_64 = a68e94064f040d60e8e4c3380efeee085b54d252d527e960dd17ac688505d5b6 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 bb85169ae041..000000000000 --- 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 - @@ -6,8 +6,8 @@ pkgbase=linux-xanmod _srcname=linux -pkgver=4.14.3 -xanmod=6 +pkgver=4.14.4 +xanmod=7_rev2 pkgrel=1 arch=('x86_64') url="http://www.xanmod.org/" @@ -23,16 +23,14 @@ source=(https://github.com/xanmod/linux/archive/${pkgver}-xanmod${xanmod}.tar.gz '90-linux.hook' # pacman hook for initramfs regeneration "$pkgbase.preset" # standard config files for mkinitcpio ramdisk 'choose-gcc-optimization.sh' - '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch' ) source_x86_64=("config::https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${arch_config_trunk}") -sha256sums=('7d2e9078dd0eb8ccf1c51c6eba658a3cb28be986019cb349ccdec05d5666fc18' +sha256sums=('f56ee8557166ae70db67788f57ff97d666935085d17c36e667ddc0e07b37674e' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '9fd3abfb3e5e6afd5b8476e30af4d7ded762f3da2a724133cb3f26ad21c31e54' - '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd') + '9fd3abfb3e5e6afd5b8476e30af4d7ded762f3da2a724133cb3f26ad21c31e54') sha256sums_x86_64=('a68e94064f040d60e8e4c3380efeee085b54d252d527e960dd17ac688505d5b6') _kernelname=${pkgbase#linux} @@ -57,9 +55,6 @@ prepare() { # CONFIG_STACK_VALIDATION gives better stack traces. Also is enabled in all official kernel packages by Archlinux team sed -i "s|# CONFIG_STACK_VALIDATION.*|CONFIG_STACK_VALIDATION=y|" ./.config - # https://bugs.archlinux.org/task/56207 - patch -Np1 -i ../0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch - # EXPERIMENTAL: let's user choose microarchitecture optimization in GCC ${srcdir}/choose-gcc-optimization.sh |