summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmilee2020-05-05 13:17:54 +0800
committershmilee2020-05-05 13:17:54 +0800
commitc5b2bf7296d22cd75b187187e86057bef4233834 (patch)
tree8736bd08596da3b7f2eb4923fd157f2cd88f7819
parentc7fe5d363aa03af762a1839ddf10f8f5db240aff (diff)
downloadaur-c5b2bf7296d22cd75b187187e86057bef4233834.tar.gz
update to LTS 5.4.36
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD18
-rw-r--r--linux-cjktty-patch-for-5.4.36+.patch11
-rw-r--r--uksm-patch-for-5.4.33+.patch11
4 files changed, 45 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d4884a705d8..e1c424b5c99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by makepkg 5.2.1
-# Wed Apr 29 12:14:51 UTC 2020
+# Thu Apr 30 06:03:31 UTC 2020
pkgbase = linux-shmilee
- pkgver = 5.4.25
- pkgrel = 2
+ pkgver = 5.4.36
+ pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
license = GPL2
@@ -16,12 +16,14 @@ pkgbase = linux-shmilee
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.25.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.36.xz
source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
source = https://raw.githubusercontent.com/dolohow/uksm/150e27c4e7f66e4519c89573305eca8c42091f4d/v5.x/uksm-5.4.patch
- source = linux-cjktty-5.3.patch::https://github.com/torvalds/linux/compare/v5.3...Gentoo-zh:5.3-utf8.patch
+ source = linux-cjktty-5.4.patch::https://github.com/torvalds/linux/compare/v5.4...Gentoo-zh:5.4-utf8.patch
source = legacy-wireless-ioctls-4.9+.patch
source = sphinx-workaround.patch
+ source = uksm-patch-for-5.4.33+.patch
+ source = linux-cjktty-patch-for-5.4.36+.patch
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -30,12 +32,14 @@ pkgbase = linux-shmilee
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
sha256sums = SKIP
- sha256sums = 9f416e8f8241eae2090f068703b7fda7b40d6c24afe9d2890eb6058f9f6c533a
+ sha256sums = 74eeb012b9147d5fdbe7a387d739f2b45232561fb31f578709ebc16a2d6ff71e
sha256sums = f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c
sha256sums = 81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e
- sha256sums = 08b2eb809d889f18e8a0da1179c0ecc63ba37313a46c908e5f4c794c528fa63f
+ sha256sums = 50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a
sha256sums = edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0
sha256sums = b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e
+ sha256sums = 6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e
+ sha256sums = 573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2
sha256sums = 7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
diff --git a/PKGBUILD b/PKGBUILD
index 5160739ad0e..2b78fdb0840 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=25
+_LLL_SUBVER=36
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU can actually run slower with NUMA enabled.
@@ -29,8 +29,8 @@ _UKSM_PATCH="https://raw.githubusercontent.com/dolohow/uksm/${_UKSM_COMMIT}/v5.x
# CJKTTY patch
# https://github.com/Gentoo-zh/linux-cjktty
-# https://github.com/torvalds/linux/compare/v5.3...Gentoo-zh:5.3-utf8
-_CJKTTY_LLL_VER=5.3
+# https://github.com/torvalds/linux/compare/v5.4...Gentoo-zh:5.4-utf8
+_CJKTTY_LLL_VER=5.4
_CJKTTY_PATCH_FILE=linux-cjktty-${_CJKTTY_LLL_VER}.patch
_CJKTTY_PATCH_URL="https://github.com/torvalds/linux/compare/v${_CJKTTY_LLL_VER}...Gentoo-zh:${_CJKTTY_LLL_VER}-utf8.patch"
_CJKTTY_PATCH="${_CJKTTY_PATCH_FILE}::${_CJKTTY_PATCH_URL}"
@@ -41,7 +41,7 @@ pkgbase=linux-shmilee
pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
_srcname=linux-${_LLL_VER}
pkgver=${_LLL_VER}.${_LLL_SUBVER}
-pkgrel=2
+pkgrel=1
arch=('x86_64')
url="https://www.kernel.org/"
license=('GPL2')
@@ -57,6 +57,8 @@ source=(
${_CJKTTY_PATCH}
'legacy-wireless-ioctls-4.9+.patch'
'sphinx-workaround.patch'
+ 'uksm-patch-for-5.4.33+.patch'
+ 'linux-cjktty-patch-for-5.4.36+.patch'
'config' # the main kernel config file
'60-linux.hook' # pacman hook for depmod
'90-linux.hook' # pacman hook for initramfs regeneration
@@ -69,12 +71,14 @@ validpgpkeys=(
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
'SKIP'
- '9f416e8f8241eae2090f068703b7fda7b40d6c24afe9d2890eb6058f9f6c533a'
+ '74eeb012b9147d5fdbe7a387d739f2b45232561fb31f578709ebc16a2d6ff71e'
'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c'
'81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e'
- '08b2eb809d889f18e8a0da1179c0ecc63ba37313a46c908e5f4c794c528fa63f'
+ '50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a'
'edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0'
'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e'
+ '6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e'
+ '573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2'
'7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
@@ -100,10 +104,12 @@ prepare() {
msg "Patching source with uksm ${_UKSM_VER} patches"
cp "../uksm-${_LLL_VER}.patch" "../uksm-${_LLL_VER}.${_LLL_SUBVER}.patch"
+ patch -i ../uksm-patch-for-5.4.33+.patch "../uksm-${_LLL_VER}.${_LLL_SUBVER}.patch"
patch -Np1 -i "../uksm-${_LLL_VER}.${_LLL_SUBVER}.patch"
msg "Patching source with Gentoo-zh/linux-cjktty patches"
cp "../${_CJKTTY_PATCH_FILE}" "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
+ patch -i ../linux-cjktty-patch-for-5.4.36+.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/linux-cjktty-patch-for-5.4.36+.patch b/linux-cjktty-patch-for-5.4.36+.patch
new file mode 100644
index 00000000000..139586c4c54
--- /dev/null
+++ b/linux-cjktty-patch-for-5.4.36+.patch
@@ -0,0 +1,11 @@
+--- linux-cjktty-5.4.patch 2020-04-30 11:29:47.000000000 +0800
++++ linux-cjktty-5.4.36.patch 2020-04-30 11:36:17.000000000 +0800
+@@ -137,7 +137,7 @@
+ if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
+ return 0;
+
+- if (new_screen_size > (4 << 20))
++ if (new_screen_size > KMALLOC_MAX_SIZE)
+ return -EINVAL;
+ - newscreen = kzalloc(new_screen_size, GFP_USER);
+ +
diff --git a/uksm-patch-for-5.4.33+.patch b/uksm-patch-for-5.4.33+.patch
new file mode 100644
index 00000000000..54b4101cfc3
--- /dev/null
+++ b/uksm-patch-for-5.4.33+.patch
@@ -0,0 +1,11 @@
+--- uksm-5.4.patch 2020-01-02 19:55:25.000000000 +0800
++++ uksm-5.4.33.patch 2020-04-29 17:04:58.000000000 +0800
+@@ -80,7 +80,7 @@
+ @@ -1384,6 +1385,7 @@ void setup_new_exec(struct linux_binprm * bprm)
+ /* An exec changes our domain. We are no longer part of the thread
+ group */
+- current->self_exec_id++;
++ WRITE_ONCE(current->self_exec_id, current->self_exec_id + 1);
+ +
+ flush_signal_handlers(current, 0);
+ }