summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2018-08-21 13:56:57 +0200
committerPiotr Gorski2018-08-21 13:56:57 +0200
commit5ce6de498c641019df18fd679c2c95129c81fe54 (patch)
treeaeca66809259f5d9eff0a1059b16d1881eb2549d
parent696b126ad06c7fa72931b7cd86c261cb2138343e (diff)
downloadaur-5ce6de498c641019df18fd679c2c95129c81fe54.tar.gz
Bump to 4.17.17-2
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO8
-rw-r--r--0002-Increase-timeout-in-lspcon_wait_mode.patch26
-rw-r--r--PKGBUILD12
3 files changed, 8 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 85e5f36c238f..d5338ec3e2a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-lqx
pkgver = 4.17.17
- pkgrel = 1
+ pkgrel = 2
url = http://liquorix.net/
arch = x86_64
license = GPL2
@@ -11,24 +11,22 @@ pkgbase = linux-lqx
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.sign
- source = https://liquorix.net/sources/4.17.17-2.patch.gz
+ source = https://liquorix.net/sources/4.17.17-3.patch.gz
source = https://liquorix.net/sources/4.17/config.amd64
source = 60-linux.hook
source = 90-linux.hook
source = 99-linux.hook
source = linux.preset
- source = 0002-Increase-timeout-in-lspcon_wait_mode.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha512sums = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
sha512sums = SKIP
- sha512sums = 67a649cd808e7ef1f47a54be56cd6a5da0ba02698e3e3c3307b885b3c75464e6b0ec0f91a776e379486fdb50b00fc99ea9ceac9d6392f3d389b6a46e2dd699a8
+ sha512sums = eb8269129e13ce0fcd921aa1a1cbdc30883329721329dd96299152c73abdd86894b69e4e7646a255a38147d169d6922f5fe8128ef26ea39f0e4e30594074c362
sha512sums = bfe1df7716a071086c91d847886bf7e0340c643f175969794b0e97f88c07e959dae8bbbf4d40e73ff27a035a8f58e4f4a45f6eaf844cc07fdfc8ef589a83e3ae
sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a
sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44
sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74
sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf
- sha512sums = 38e3d30fba9ec7faa2e7ef2bc13f054fe30d863192d340c45b1e5624716617b21fe825537cefb00c5257f31f77e7050175ad098b9bbc0f29359bf1b7487e5afd
pkgname = linux-lqx
pkgdesc = A desktop oriented kernel and modules with Liquorix patches
diff --git a/0002-Increase-timeout-in-lspcon_wait_mode.patch b/0002-Increase-timeout-in-lspcon_wait_mode.patch
deleted file mode 100644
index 4c8abfe35416..000000000000
--- a/0002-Increase-timeout-in-lspcon_wait_mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f9199cfdc7f09601adbb40827077991a1f6bd73a Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 13 Aug 2018 00:40:29 +0200
-Subject: [PATCH] Increase timeout in lspcon_wait_mode
-
-From https://bugs.freedesktop.org/attachment.cgi?id=141051&action=edit
----
- drivers/gpu/drm/i915/intel_lspcon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
-index 8ae8f42f430a..be1b08f589a4 100644
---- a/drivers/gpu/drm/i915/intel_lspcon.c
-+++ b/drivers/gpu/drm/i915/intel_lspcon.c
-@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,
- DRM_DEBUG_KMS("Waiting for LSPCON mode %s to settle\n",
- lspcon_mode_name(mode));
-
-- wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 100);
-+ wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 1000);
- if (current_mode != mode)
- DRM_ERROR("LSPCON mode hasn't settled\n");
-
---
-2.18.0.547.g1d89318c4
-
diff --git a/PKGBUILD b/PKGBUILD
index 7286d996adf1..827ab5fe99c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -57,8 +57,8 @@ _major=4.17
_minor=17
pkgver=${_major}.${_minor}
_srcname=linux-${_major}
-pkgrel=1
-lqxrel=2
+pkgrel=2
+lqxrel=3
_lqxpatchname="${pkgver}-${lqxrel}.patch"
arch=('x86_64')
url="http://liquorix.net/"
@@ -77,8 +77,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
# pacman hook for remove initramfs
'99-linux.hook'
# standard config files for mkinitcpio ramdisk
- 'linux.preset'
- '0002-Increase-timeout-in-lspcon_wait_mode.patch')
+ 'linux.preset')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-lqx}
@@ -363,13 +362,12 @@ done
sha512sums=('4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db'
'SKIP'
- '67a649cd808e7ef1f47a54be56cd6a5da0ba02698e3e3c3307b885b3c75464e6b0ec0f91a776e379486fdb50b00fc99ea9ceac9d6392f3d389b6a46e2dd699a8'
+ 'eb8269129e13ce0fcd921aa1a1cbdc30883329721329dd96299152c73abdd86894b69e4e7646a255a38147d169d6922f5fe8128ef26ea39f0e4e30594074c362'
'bfe1df7716a071086c91d847886bf7e0340c643f175969794b0e97f88c07e959dae8bbbf4d40e73ff27a035a8f58e4f4a45f6eaf844cc07fdfc8ef589a83e3ae'
'7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
'4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
'6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74'
- '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
- '38e3d30fba9ec7faa2e7ef2bc13f054fe30d863192d340c45b1e5624716617b21fe825537cefb00c5257f31f77e7050175ad098b9bbc0f29359bf1b7487e5afd')
+ '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds