summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD26
-rw-r--r--fix_patch-5.2-ck1_for_systemd-detect-virt_containers.patch14
3 files changed, 35 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2fb54697033..17f0e4822f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ck
pkgver = 5.2.14
- pkgrel = 2
+ pkgrel = 3
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -17,6 +17,7 @@ pkgbase = linux-ck
source = linux.preset
source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.2/5.2-ck1/patch-5.2-ck1.xz
+ source = fix_patch-5.2-ck1_for_systemd-detect-virt_containers.patch
source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
source = 0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
source = 0003-Btrfs-fix-unwritten-extent-buffers-and-hangs-on-futu.patch
@@ -30,6 +31,7 @@ pkgbase = linux-ck
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
sha256sums = f1abc13a8d859fbf6350040e45d7f04ad551a6d39f113ba96fbbd820118c0e36
+ sha256sums = c3215b4eaf707d1a7d783b1661e9df038f93605ad2ae7936238a8e2ed109ea75
sha256sums = 91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3
sha256sums = 63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9
sha256sums = f45f8695a7fe308b7aaef874df0a51ce91ac47ef180adf0cc507b482aad2459f
diff --git a/PKGBUILD b/PKGBUILD
index 2aafd3d27e9..3431cb980a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,7 +65,7 @@ _localmodcfg=
pkgbase=linux-ck
_srcver=5.2.14-arch1
pkgver=${_srcver%-*}
-pkgrel=2
+pkgrel=3
_ckpatchversion=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -82,6 +82,7 @@ source=(
linux.preset # standard config files for mkinitcpio ramdisk
"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.2/5.2-ck${_ckpatchversion}/$_ckpatch.xz"
+ fix_patch-5.2-ck1_for_systemd-detect-virt_containers.patch
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
0003-Btrfs-fix-unwritten-extent-buffers-and-hangs-on-futu.patch
@@ -98,6 +99,7 @@ sha256sums=('c64d36477fee6a864a734ec417407768e60040a13f144c33208fa9622fd0ce8c'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
'f1abc13a8d859fbf6350040e45d7f04ad551a6d39f113ba96fbbd820118c0e36'
+ 'c3215b4eaf707d1a7d783b1661e9df038f93605ad2ae7936238a8e2ed109ea75'
'91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3'
'63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9'
'f45f8695a7fe308b7aaef874df0a51ce91ac47ef180adf0cc507b482aad2459f')
@@ -106,6 +108,10 @@ _kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
prepare() {
+ # fix for systemd-detect-virt containers
+ # https://bbs.archlinux.org/viewtopic.php?pid=1863567#p1863567
+ patch -i fix_patch-5.2-ck1_for_systemd-detect-virt_containers.patch
+
cd linux-${pkgver}
msg2 "Setting version..."
@@ -113,17 +119,11 @@ prepare() {
echo "-$pkgrel" > localversion.10-pkgrel
echo "$_kernelname" > localversion.20-pkgname
- # fix naming schema in EXTRAVERSION of ck patch set
- sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatch}"
-
- msg2 "Patching with ck patchset..."
- patch -Np1 -i "$srcdir/${_ckpatch}"
-
local src
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
- [[ $src = *.patch ]] || continue
+ [[ $src = 00*.patch ]] || continue
msg2 "Applying patch $src..."
patch -Np1 < "../$src"
done
@@ -134,6 +134,16 @@ prepare() {
# https://bbs.archlinux.org/viewtopic.php?pid=1824594#p1824594
sed -i -e 's/# CONFIG_PSI_DEFAULT_DISABLED is not set/CONFIG_PSI_DEFAULT_DISABLED=y/' ./.config
+ # https://bbs.archlinux.org/viewtopic.php?pid=1863567#p1863567
+ sed -i -e '/CONFIG_LATENCYTOP=/ s,y,n,' \
+ -i -e '/CONFIG_SCHED_DEBUG=/ s,y,n,' ./.config
+
+ # fix naming schema in EXTRAVERSION of ck patch set
+ sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatch}"
+
+ msg2 "Patching with ck patchset..."
+ patch -Np1 -i ../"${_ckpatch}"
+
# https://github.com/graysky2/kernel_gcc_patch
msg2 "Applying enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch ..."
patch -Np1 -i "$srcdir/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v4.13+.patch"
diff --git a/fix_patch-5.2-ck1_for_systemd-detect-virt_containers.patch b/fix_patch-5.2-ck1_for_systemd-detect-virt_containers.patch
new file mode 100644
index 00000000000..a865e34091f
--- /dev/null
+++ b/fix_patch-5.2-ck1_for_systemd-detect-virt_containers.patch
@@ -0,0 +1,14 @@
+--- a/patch-5.2-ck1 2019-09-15 09:50:19.754754121 -0400
++++ b/patch-5.2-ck1 2019-09-15 09:51:08.842070790 -0400
+@@ -14886,7 +14886,10 @@ index 000000000000..ab972d0af7b5
+ +
+ +void proc_sched_show_task(struct task_struct *p, struct pid_namespace *ns,
+ + struct seq_file *m)
+-+{}
+++{
+++ seq_printf(m, "%s (%d, #threads: %d)\n", p->comm, task_pid_nr_ns(p, ns),
+++ get_nr_threads(p));
+++}
+ +
+ +void proc_sched_set_task(struct task_struct *p)
+ +{}