From 888f94c78bd0a402447fcb07d234b8863b8b5ba7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Jun 2018 14:14:45 +0200 Subject: [PATCH] linux4.17: update to 4.17.3. Closes #206. --- .../linux4.17/patches/gpd-win-2-goodix.patch | 26 -------------- .../linux4.17/patches/gpd-win-2-xpad.patch | 34 ------------------- srcpkgs/linux4.17/template | 6 ++-- 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch delete mode 100644 srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch diff --git a/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch b/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch deleted file mode 100644 index 4ea2e4e3de1..00000000000 --- a/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit ec62ab71dab19c079bd689e907bbb0e3ce5b546f -Author: Ethan Lee -Date: Thu May 31 16:13:17 2018 -0700 - - Input: goodix - add new ACPI id for GPD Win 2 touch screen - - GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp - - Tested on a unit from the first production run sent to Indiegogo backers - - Signed-off-by: Ethan Lee - Cc: stable@vger.kernel.org - Signed-off-by: Dmitry Torokhov - -diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c -index 9736c83dd418..f2d9c2c41885 100644 ---- a/drivers/input/touchscreen/goodix.c -+++ b/drivers/input/touchscreen/goodix.c -@@ -933,6 +933,7 @@ MODULE_DEVICE_TABLE(i2c, goodix_ts_id); - #ifdef CONFIG_ACPI - static const struct acpi_device_id goodix_acpi_match[] = { - { "GDIX1001", 0 }, -+ { "GDIX1002", 0 }, - { } - }; - MODULE_DEVICE_TABLE(acpi, goodix_acpi_match); diff --git a/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch b/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch deleted file mode 100644 index 0051c49766d..00000000000 --- a/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3e8a4c1a96a49ab258307132a641631ac7462fcf (HEAD) -Author: Ethan Lee -Date: Fri Jun 1 11:46:08 2018 -0700 - - Input: xpad - add GPD Win 2 Controller USB IDs - - GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp - - Tested on a unit from the first production run sent to Indiegogo backers - - Signed-off-by: Ethan Lee - Cc: stable@vger.kernel.org - Signed-off-by: Dmitry Torokhov - -diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c -index 06e9650b3b30..a89b81b35932 100644 ---- a/drivers/input/joystick/xpad.c -+++ b/drivers/input/joystick/xpad.c -@@ -123,6 +123,7 @@ static const struct xpad_device { - u8 mapping; - u8 xtype; - } xpad_device[] = { -+ { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 }, - { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, - { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, - { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, -@@ -409,6 +410,7 @@ static const signed short xpad_abs_triggers[] = { - - static const struct usb_device_id xpad_table[] = { - { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ -+ XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ - XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ - XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ - XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ diff --git a/srcpkgs/linux4.17/template b/srcpkgs/linux4.17/template index dd7a000d135..9647c21031d 100644 --- a/srcpkgs/linux4.17/template +++ b/srcpkgs/linux4.17/template @@ -1,7 +1,7 @@ # Template file for 'linux4.17' pkgname=linux4.17 -version=4.17.1 -revision=2 +version=4.17.3 +revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=c93f3fbcbce66b7ed51e1d33d669b0ad56dd5088c23ea77fb8925b328faa7070 +checksum=af32ab2427cd0916c030c751b6b8fd4e72b7359feefd642aefad74838e921ffd nodebug=yes # -dbg package is generated below manually nostrip=yes