summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD20
-rw-r--r--fix_ck1_for_5.7.17.patch14
3 files changed, 42 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2a7f17966dd4..4f89402bf690 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ck
- pkgver = 5.7.16
- pkgrel = 2
+ pkgver = 5.7.17
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -8,32 +8,36 @@ pkgbase = linux-ck
makedepends = kmod
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.16.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.16.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.17.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.17.tar.sign
source = config
source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.7/5.7-ck1/patch-5.7-ck1.xz
+ source = fix_ck1_for_5.7.14.patch
+ source = fix_ck1_for_5.7.17.patch
source = unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch
source = unfuck-ck1-fix-suspend-to-ram.patch::https://github.com/zen-kernel/zen-kernel/commit/fb7e2cfaf61cf5f9c2336331e73296f455bd2d51.patch
+ source = unfuck-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch::https://github.com/zen-kernel/zen-kernel/commit/e7113f2c1d56962d4afabc627ad761c138f5b858.patch
source = 0000-sphinx-workaround.patch
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
source = 0003-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
- source = fix_ck1_for_5.7.14.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = 578e4e65bd4f96e8a1ab462fd7b6ca5450d7cc51fe24bb9df1d664188a61d755f91185674f9b503051ff771336d2fc75f37f04d0ea93a5f6738556802097f6d9
+ b2sums = ef73f9c940d678465d1ff2c4eb880b6878827f563942666aab0fb49be9c24d6a12a78a2c569c9cb35023c82a195945b392ca00a933726701c0cff092f71141b6
b2sums = SKIP
b2sums = 4fcc0fb8672d93c2702d7e42ed15824dd58f6822fd14fb4439aca773e9860c942c833586c47e4707832fc2fb4eda832dc4fd1506c8bfe3f99fe2654bfd54e5bd
b2sums = c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c
b2sums = 29b2530e91a7c0f75c47d75361a94ec92fec398cef1b3e213e97c8f9e0ed210711c4c63ae7717f59273105a83e30397cbd5b7252cb94c06d9b328a24c70ad444
+ b2sums = 5d4275b060aac58206c5a76b554168dbcb95b2e469bdad6de78c8815d34eb970483f36a18b7343121dc70358c447d6fd66e30f64cf8c429656816aa8dd42db38
+ b2sums = fb7fc6ae5df7765b5f28350032469d756ff9bad4de73395ded1c242f402e7c326f963627dcb35a92ac0e8011a17de03cfccf50a40faa4147e43bb9dd5f7d7028
b2sums = 84c9438120100bb5b21122a29344b9e818514d94a31b6d57519a6e25385cb7f91a7f87c930da55c828c7a4330959a94b8a3a3d56773c46b335e1380cd00180b1
b2sums = 5dfb38f2096f27cf436afa6ac41d432f4e23295deb26d12146b31c57db85a8be59819f08f9c5197183c26c557b32e967edded22206c1abb9b89b83e61450ec5c
+ b2sums = 5c56a6bcf03b8b771cf5a96161eaded2ff987732e41b09c31c4c894a42d300167c9acbed49e35ef6cf86cd8c986bd57ddd3dc9552914a2804559447a6ce9efb2
b2sums = b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95
b2sums = cfac70bc43305a6dda6b812092da4e947bf91866a24fa62ecad40727e39cf9a54cc41fae0f9d6477e1b37731e39bce12a737ea421056a650b7f14236a8b3f870
b2sums = 3fb9b66e85cf1a6921dab85dc831a5f1a97e61bbbec3bcfe191962e52da8481876fe6599f7884265e9a5d9773baa31ae3770e954672f75a7cf62b62fdb9b985a
b2sums = b7c825b9606dcb10a68a1efabfe1b8eeb8e2b0a1737fd0a263475729501095f877b00f5132c0ad3a2a9c1515572145f5dc7cbd290ded7be2abbc5210015604df
- b2sums = 5d4275b060aac58206c5a76b554168dbcb95b2e469bdad6de78c8815d34eb970483f36a18b7343121dc70358c447d6fd66e30f64cf8c429656816aa8dd42db38
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
@@ -42,11 +46,11 @@ pkgname = linux-ck
depends = initramfs
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
- provides = linux-ck=5.7.16
+ provides = linux-ck=5.7.17
pkgname = linux-ck-headers
pkgdesc = Headers and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.7.16
- provides = linux-headers=5.7.16
+ provides = linux-ck-headers=5.7.17
+ provides = linux-headers=5.7.17
diff --git a/PKGBUILD b/PKGBUILD
index 02f724078b06..5754f6a9aefc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,8 +64,8 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.7.16
-pkgrel=2
+pkgver=5.7.17
+pkgrel=1
_ckpatchversion=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -81,30 +81,34 @@ source=(
config # the main kernel config file
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
"http://ck.kolivas.org/patches/5.0/5.7/5.7-ck${_ckpatchversion}/$_ckpatch.xz"
+ fix_ck1_for_5.7.14.patch
+ fix_ck1_for_5.7.17.patch
"unfuck-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch"
"unfuck-ck1-fix-suspend-to-ram.patch::https://github.com/zen-kernel/zen-kernel/commit/fb7e2cfaf61cf5f9c2336331e73296f455bd2d51.patch"
+ "unfuck-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch::https://github.com/zen-kernel/zen-kernel/commit/e7113f2c1d56962d4afabc627ad761c138f5b858.patch"
0000-sphinx-workaround.patch
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-PCI-EDR-Log-only-ACPI_NOTIFY_DISCONNECT_RECOVER-even.patch
0003-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
- fix_ck1_for_5.7.14.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('578e4e65bd4f96e8a1ab462fd7b6ca5450d7cc51fe24bb9df1d664188a61d755f91185674f9b503051ff771336d2fc75f37f04d0ea93a5f6738556802097f6d9'
+b2sums=('ef73f9c940d678465d1ff2c4eb880b6878827f563942666aab0fb49be9c24d6a12a78a2c569c9cb35023c82a195945b392ca00a933726701c0cff092f71141b6'
'SKIP'
'4fcc0fb8672d93c2702d7e42ed15824dd58f6822fd14fb4439aca773e9860c942c833586c47e4707832fc2fb4eda832dc4fd1506c8bfe3f99fe2654bfd54e5bd'
'c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c'
'29b2530e91a7c0f75c47d75361a94ec92fec398cef1b3e213e97c8f9e0ed210711c4c63ae7717f59273105a83e30397cbd5b7252cb94c06d9b328a24c70ad444'
+ '5d4275b060aac58206c5a76b554168dbcb95b2e469bdad6de78c8815d34eb970483f36a18b7343121dc70358c447d6fd66e30f64cf8c429656816aa8dd42db38'
+ 'fb7fc6ae5df7765b5f28350032469d756ff9bad4de73395ded1c242f402e7c326f963627dcb35a92ac0e8011a17de03cfccf50a40faa4147e43bb9dd5f7d7028'
'84c9438120100bb5b21122a29344b9e818514d94a31b6d57519a6e25385cb7f91a7f87c930da55c828c7a4330959a94b8a3a3d56773c46b335e1380cd00180b1'
'5dfb38f2096f27cf436afa6ac41d432f4e23295deb26d12146b31c57db85a8be59819f08f9c5197183c26c557b32e967edded22206c1abb9b89b83e61450ec5c'
+ '5c56a6bcf03b8b771cf5a96161eaded2ff987732e41b09c31c4c894a42d300167c9acbed49e35ef6cf86cd8c986bd57ddd3dc9552914a2804559447a6ce9efb2'
'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
'cfac70bc43305a6dda6b812092da4e947bf91866a24fa62ecad40727e39cf9a54cc41fae0f9d6477e1b37731e39bce12a737ea421056a650b7f14236a8b3f870'
'3fb9b66e85cf1a6921dab85dc831a5f1a97e61bbbec3bcfe191962e52da8481876fe6599f7884265e9a5d9773baa31ae3770e954672f75a7cf62b62fdb9b985a'
- 'b7c825b9606dcb10a68a1efabfe1b8eeb8e2b0a1737fd0a263475729501095f877b00f5132c0ad3a2a9c1515572145f5dc7cbd290ded7be2abbc5210015604df'
- '5d4275b060aac58206c5a76b554168dbcb95b2e469bdad6de78c8815d34eb970483f36a18b7343121dc70358c447d6fd66e30f64cf8c429656816aa8dd42db38')
+ 'b7c825b9606dcb10a68a1efabfe1b8eeb8e2b0a1737fd0a263475729501095f877b00f5132c0ad3a2a9c1515572145f5dc7cbd290ded7be2abbc5210015604df')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
@@ -114,6 +118,9 @@ prepare() {
# changes from 5.7.13 to 5.7.14 breaks ck1
patch -Np1 -i fix_ck1_for_5.7.14.patch
+ # changes from 5.7.16 to 5.7.17 breaks ck1
+ patch -Np1 -i fix_ck1_for_5.7.17.patch
+
cd linux-${pkgver}
echo "Setting version..."
@@ -158,6 +165,7 @@ prepare() {
patch -Np1 -i ../"${_ckpatch}"
patch -Np1 -i ../unfuck-ck1.patch
patch -Np1 -i ../unfuck-ck1-fix-suspend-to-ram.patch
+ patch -Np1 -i ../unfuck-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch
# non-interactively apply ck1 default options
# this isn't redundant if we want a clean selection of subarch below
diff --git a/fix_ck1_for_5.7.17.patch b/fix_ck1_for_5.7.17.patch
new file mode 100644
index 000000000000..aa83eadd0dc1
--- /dev/null
+++ b/fix_ck1_for_5.7.17.patch
@@ -0,0 +1,14 @@
+Thanks to ooo for pointing this out
+https://aur.archlinux.org/packages/linux-ck/#comment-762177
+
+--- a/patch-5.7-ck1 2020-06-10 00:59:29.000000000 +0300
++++ b/patch-5.7-ck1 2020-08-23 13:42:46.304190376 +0300
+@@ -12162,7 +12162,7 @@
+ @@ -211,7 +217,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;