summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmilee2020-09-05 20:53:36 +0800
committershmilee2020-09-05 20:53:36 +0800
commit0ac4b4ee48a6df2f1bb6c55acbccaa44b2d29042 (patch)
treea4d1272187693f26a83fa86c22e7d07a47720e6d
parent53ce0b4a609869b6620c6f60c6309e9b440dd594 (diff)
downloadaur-0ac4b4ee48a6df2f1bb6c55acbccaa44b2d29042.tar.gz
test: LTS 5.4.62
-rw-r--r--PKGBUILD10
-rw-r--r--ck-patch-for-5.4.62+.patch11
-rw-r--r--linux-cjktty-patch-for-5.4.62+.patch11
3 files changed, 30 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index b05a35539cd..1cbe21501fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
# https://www.kernel.org/category/releases.html
# 5.4 Greg Kroah-Hartman & Sasha Levin 2019-11-24 Dec, 2021
_LLL_VER=5.4
-_LLL_SUBVER=60
+_LLL_SUBVER=62
# Bisect debug, v5.4.47 -> v5.4.48
_Bisect_debug=off # on, test, off
@@ -73,9 +73,11 @@ source=(
'legacy-wireless-ioctls-4.9+.patch'
'sphinx-workaround.patch'
'ck-patch-for-5.4.57+.patch'
+ 'ck-patch-for-5.4.62+.patch'
'uksm-patch-for-5.4.33+.patch'
'linux-cjktty-patch-for-5.4.36+.patch'
'linux-cjktty-patch-for-5.4.54+.patch'
+ 'linux-cjktty-patch-for-5.4.62+.patch'
'broken-sleep-5.4.48+.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=f7757368e0f0b3e108088ca7b5b8abda6faa7ebc'
'config' # the main kernel config file
'60-linux.hook' # pacman hook for depmod
@@ -89,16 +91,18 @@ validpgpkeys=(
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
'SKIP'
- '03fd731d632249ec5233a02343273f7f23e23127ebd860490b283a01caecff80'
+ '9ce992afb4893a88c25d8dada043690d356176cca0d943091d5e2f2fcd856008'
'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c'
'81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e'
'50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a'
'edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0'
'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e'
'a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f'
+ 'cbdc582fd9c65b1ff94088ea1dcd8123f13b6abc3acca93bd6bee7cad11f9c33'
'6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e'
'573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2'
'2c9faabb5e09b1f818b051ced3eb90b6c04aa08616952d99eedf328c7c8dda2f'
+ '4d511fb62966549b9ea4a1d97769f79e4d66fc141cd0b001e7d286367a038a09'
'9f9ec5becca27bc7b65b372254bcd4c64069deff1d3b7fa15e6e416595163654'
'7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -140,6 +144,7 @@ prepare() {
msg "Patching source with ck${_CK_VER} including BFS"
cp "../patch-${_LLL_VER}-ck${_CK_VER}" "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
patch -i ../ck-patch-for-5.4.57+.patch "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
+ patch -i ../ck-patch-for-5.4.62+.patch "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
patch -Np1 -i "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
msg "Patching source with uksm ${_UKSM_VER} patches"
@@ -151,6 +156,7 @@ prepare() {
cp "../${_CJKTTY_PATCH_FILE}.patch" "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
patch -i ../linux-cjktty-patch-for-5.4.36+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
patch -i ../linux-cjktty-patch-for-5.4.54+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
+ patch -i ../linux-cjktty-patch-for-5.4.62+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
patch -Np1 -i "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
msg "Patching source to reinstate the legacy wireless ioctls"
diff --git a/ck-patch-for-5.4.62+.patch b/ck-patch-for-5.4.62+.patch
new file mode 100644
index 00000000000..5b76de16124
--- /dev/null
+++ b/ck-patch-for-5.4.62+.patch
@@ -0,0 +1,11 @@
+--- patch-5.4.61-ck1 2020-09-04 22:10:44.000000000 +0800
++++ patch-5.4.62-ck1 2020-09-05 10:27:35.000000000 +0800
+@@ -16691,7 +16691,7 @@
+ @@ -213,7 +219,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs,
+ struct rq *rq = cpu_rq(cpu);
+
+- if (!IS_BUILTIN(CONFIG_UCLAMP_TASK) &&
++ if (!uclamp_is_used() &&
+ - type == FREQUENCY_UTIL && rt_rq_is_runnable(&rq->rt)) {
+ + type == FREQUENCY_UTIL && rt_rq_runnable(rq)) {
+ return max;
diff --git a/linux-cjktty-patch-for-5.4.62+.patch b/linux-cjktty-patch-for-5.4.62+.patch
new file mode 100644
index 00000000000..4f6e7877c5d
--- /dev/null
+++ b/linux-cjktty-patch-for-5.4.62+.patch
@@ -0,0 +1,11 @@
+--- linux-cjktty-5.4.61.patch 2020-09-05 10:35:09.000000000 +0800
++++ linux-cjktty-5.4.62.patch 2020-09-05 20:41:19.000000000 +0800
+@@ -169,7 +169,7 @@
+ + scr_memsetw((void *)new_origin + (new_screen_size), vc->vc_video_erase_char,
+ + new_scr_end - new_origin);
+ + }
+- kfree(vc->vc_screenbuf);
++ oldscreen = vc->vc_screenbuf;
+ vc->vc_screenbuf = newscreen;
+ vc->vc_screenbuf_size = new_screen_size;
+ @@ -2601,6 +2635,8 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co