diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 8 | ||||
| -rw-r--r-- | 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 12 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
4 files changed, 27 insertions, 25 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Mar 9 19:23:34 UTC 2018 +# Sat Mar 10 12:22:19 UTC 2018 pkgbase = linux-ck pkgver = 4.15.8 - pkgrel = 1 + pkgrel = 2 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 license = GPL2 @@ -19,7 +19,7 @@ pkgbase = linux-ck source = 60-linux.hook source = 90-linux.hook source = linux.preset - source = enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch + source = enable_additional_cpu_optimizations-20180310.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180310.tar.gz source = http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -31,10 +31,10 @@ pkgbase = linux-ck sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = 738f96d2cdc52a04b6e6959f3436c0388db38d18a4ac47fb0a82021faff8f9c5 + sha256sums = b2c1292e06544465b636543e6ac8a01959470d32ce3664460721671f1347c815 sha256sums = af51d2433340fdd88a73fdfdfa88b304b3933a937c7ef16a22ba73950360de71 - sha256sums = c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863 - sha256sums = b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676 + sha256sums = 4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab + sha256sums = 12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.170 diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index f155e964b1e2..b39ed26b751d 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From 05a43fb8b36cdaf6a3580f46cab334f2c2796544 Mon Sep 17 00:00:00 2001 -Message-Id: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> +From 188720e92122385994143a06cb16a930053eb503 Mon Sep 17 00:00:00 2001 +Message-Id: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com> From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> @@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.16.1 +2.16.2 diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch index 97848fc18593..2383c31fddd9 100644 --- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -1,10 +1,10 @@ -From 9ae12d036a480aa5352118c982ba76f2fb1640a3 Mon Sep 17 00:00:00 2001 -Message-Id: <9ae12d036a480aa5352118c982ba76f2fb1640a3.1518828081.git.jan.steffens@gmail.com> -In-Reply-To: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> -References: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> +From 704e31424615c87ad82424a9b09a452d762daed0 Mon Sep 17 00:00:00 2001 +Message-Id: <704e31424615c87ad82424a9b09a452d762daed0.1520639721.git.jan.steffens@gmail.com> +In-Reply-To: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com> +References: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com> From: Jim Bride <jim.bride@linux.intel.com> Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 2/3] drm/i915/edp: Only use the alternate fixed mode if it's +Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's asked for In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for @@ -38,5 +38,5 @@ index add4b2434aa3..14a8bef9fdfe 100644 } -- -2.16.1 +2.16.2 @@ -10,7 +10,7 @@ _makenconfig= # Optionally select a sub architecture by number if building in a clean chroot # Leaving this entry blank will require user interaction during the build # which will cause a failure to build if using makechrootpkg. Note that the -# generic (default) option is 23. +# generic (default) option is 24. # # 1. AMD Opteron/Athlon64/Hammer/K8 (MK8) # 2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3) @@ -34,7 +34,9 @@ _makenconfig= # 20. Intel Haswell (MHASWELL) # 21. Intel Broadwell (MBROADWELL) # 22. Intel Skylake (MSKYLAKE) -# 23. Generic-x86-64 (GENERIC_CPU) +# 23. Intel Skylake X (MSKYLAKEX) +# 24. Generic-x86-64 (GENERIC_CPU) +# 25. Native optimizations autodetected by GCC (MNATIVE) _subarch= # NUMA is optimized for multi-socket motherboards. A single multi-core CPU can @@ -63,7 +65,7 @@ _localmodcfg= pkgbase=linux-ck _srcname=linux-4.15 pkgver=4.15.8 -pkgrel=1 +pkgrel=2 _ckpatchversion=1 arch=('x86_64') url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -71,7 +73,7 @@ license=('GPL2') makedepends=('kmod' 'inetutils' 'bc' 'libelf') options=('!strip') _ckpatchname="patch-4.15-ck${_ckpatchversion}" -_gcc_patch='enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch' +_gcc_more_v='20180310' source=( https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign @@ -80,7 +82,7 @@ source=( 60-linux.hook # pacman hook for depmod 90-linux.hook # pacman hook for initramfs regeneration linux.preset # standard config files for mkinitcpio ramdisk - "$_gcc_patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch" + "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" # enable_additional_cpu_optimizations_for_gcc "http://ck.kolivas.org/patches/4.0/4.15/4.15-ck${_ckpatchversion}/${_ckpatchname}.xz" 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -97,10 +99,10 @@ sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '738f96d2cdc52a04b6e6959f3436c0388db38d18a4ac47fb0a82021faff8f9c5' + 'b2c1292e06544465b636543e6ac8a01959470d32ce3664460721671f1347c815' 'af51d2433340fdd88a73fdfdfa88b304b3933a937c7ef16a22ba73950360de71' - 'c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863' - 'b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676') + '4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab' + '12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -128,7 +130,7 @@ prepare() { # Patch source to unlock additional gcc CPU optimizatons # https://github.com/graysky2/kernel_gcc_patch - patch -Np1 -i "../${_gcc_patch}" + patch -Np1 -i "../kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch" # Clean tree and copy ARCH config over make mrproper |