From c77b586badc9e12e29ab4a74de7524901e4b6c72 Mon Sep 17 00:00:00 2001 From: Joakim Hernberg Date: Thu, 21 Feb 2019 20:06:46 +0100 Subject: bump to 4.14.93_rt53-1 --- .SRCINFO | 38 +- ...to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 28 +- ...p-Only-use-the-alternate-fixed-mode-if-it.patch | 42 - PKGBUILD | 335 +-- config | 2818 +++++++++++++------- 5 files changed, 2057 insertions(+), 1204 deletions(-) delete mode 100644 0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch diff --git a/.SRCINFO b/.SRCINFO index d954e46..2c8443b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ -# Generated by makepkg 5.1.1 -# Wed Sep 26 09:48:29 UTC 2018 +# Generated by makepkg 5.1.2 +# Thu Feb 21 19:03:48 UTC 2019 pkgbase = linux-rt-lts - pkgver = 4.14.71_rt44 + pkgver = 4.14.93_rt53 pkgrel = 1 - url = https://www.kernel.org/ + url = https://git.archlinux.org/linux.git/log/?h=v arch = x86_64 license = GPL2 makedepends = xmlto @@ -11,34 +11,36 @@ pkgbase = linux-rt-lts makedepends = inetutils makedepends = bc makedepends = libelf + makedepends = git + makedepends = python-sphinx + makedepends = graphviz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.71.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.71.tar.sign - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.71-rt44.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.71-rt44.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.93.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.93.tar.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.93-rt53.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.93-rt53.patch.sign + source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch + source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch source = config source = 60-linux-rt-lts.hook source = 90-linux-rt-lts.hook source = linux-rt-lts.preset - source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - source = 0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E + validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73 validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 - sha256sums = 76a4473dbcbd922c23a16130414829a36eb7e2f4e5859bd1b742fffdff907489 + sha256sums = bb125fb204f7089782e179126121dd0f0aad9f02b7517ce3744982254c221bad sha256sums = SKIP - sha256sums = 19aee946cce23b9fd3696bd4595b0cd8f0e3b7aae56f8a82fa845eb00faec2b7 + sha256sums = 151bc28f2b33d952dac8b8d5059f18205f89002c9b58a523cdfe2e1a26646d4d sha256sums = SKIP - sha256sums = 12b73ca9ec3acf9058bf922b60a8773f216cf6e774e21d42a2d09f3013e7a5d2 + sha256sums = 75aa8dd708ca5a0137fbf7cddc9cafefe6aac6b8e0638c06c156d412d05af4bc + sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 + sha256sums = 1563a6aff2d3e8e751c4260dd8e6d723be7de8e44a5eb4619935449a79699094 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = d8a865a11665424b21fe6be9265eb287ee6d5646261a486954ddf3a4ee87e78f - sha256sums = ec7342aab478af79a17ff65cf65bbd6744b0caee8f66c77a39bba61a78e6576d - sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 pkgname = linux-rt-lts pkgdesc = The Linux-rt-lts kernel and modules @@ -46,7 +48,7 @@ pkgname = linux-rt-lts depends = coreutils depends = linux-firmware depends = kmod - depends = mkinitcpio>=0.7 + depends = mkinitcpio optdepends = crda: to set the correct wireless channels of your country backup = etc/mkinitcpio.d/linux-rt-lts.preset 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 c3364a4..e57df3b 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,9 +1,7 @@ -From 0b716bdb952b678d9bb5eb32198dbc82ec492df2 Mon Sep 17 00:00:00 2001 -Message-Id: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com> +From 1a47eb71988a919e811ce558f6f58855155c6218 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/6] add sysctl to disallow unprivileged CLONE_NEWUSER by - default +Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn [bwh: Remove unneeded binary sysctl bits] @@ -15,10 +13,10 @@ Signed-off-by: Daniel Micay 3 files changed, 30 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c -index 500ce64517d93e68..35f5860958b40e9b 100644 +index 8ed48ca2cc43..e02823819ab7 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -102,6 +102,11 @@ +@@ -103,6 +103,11 @@ #define CREATE_TRACE_POINTS #include @@ -30,7 +28,7 @@ index 500ce64517d93e68..35f5860958b40e9b 100644 /* * Minimum number of threads to boot the kernel -@@ -1554,6 +1559,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1625,6 +1630,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -41,7 +39,7 @@ index 500ce64517d93e68..35f5860958b40e9b 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2347,6 +2356,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -2421,6 +2430,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -55,7 +53,7 @@ index 500ce64517d93e68..35f5860958b40e9b 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 56aca862c4f584f5..e8402ba393c1915d 100644 +index 2d9837c0aff4..eb5236c069fc 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -105,6 +105,9 @@ extern int core_uses_pid; @@ -68,7 +66,7 @@ index 56aca862c4f584f5..e8402ba393c1915d 100644 extern int pid_max; extern int pid_max_min, pid_max_max; extern int percpu_pagelist_fraction; -@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = { +@@ -519,6 +522,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -85,12 +83,12 @@ index 56aca862c4f584f5..e8402ba393c1915d 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index c490f1e4313b998a..dd03bd39d7bf194d 100644 +index e5222b5fb4fe..c941a66e51d1 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c -@@ -24,6 +24,9 @@ - #include - #include +@@ -26,6 +26,9 @@ + #include + #include +/* sysctl */ +int unprivileged_userns_clone; @@ -99,5 +97,5 @@ index c490f1e4313b998a..dd03bd39d7bf194d 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.15.1 +2.19.0 diff --git a/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch deleted file mode 100644 index 5d36d15..0000000 --- a/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cf45be4971bdd769c09e2a11db483510cd0bcc5f Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com> -References: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com> -From: Jim Bride -Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 6/6] 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 -eDP if available."), the patch allows for the use of an alternate fixed -mode if it is available, but the patch was not ensuring that the only -time the alternate mode is used is when it is specifically requested. -This patch adds an additional comparison to intel_edp_compare_alt_mode -to ensure that we only use the alternate mode if it is directly -requested. - -Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.") -Cc: David Weinehall -Cc: Rodrigo Vivi -Signed-off-by: Jim Bride ---- - drivers/gpu/drm/i915/intel_dp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index 09f274419eea1c74..838cee312e8e6978 100644 ---- a/drivers/gpu/drm/i915/intel_dp.c -+++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -1632,7 +1632,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, - m1->vdisplay == m2->vdisplay && - m1->vsync_start == m2->vsync_start && - m1->vsync_end == m2->vsync_end && -- m1->vtotal == m2->vtotal); -+ m1->vtotal == m2->vtotal && -+ m1->vrefresh == m2->vrefresh); - return bres; - } - --- -2.15.1 - diff --git a/PKGBUILD b/PKGBUILD index a85b737..f1b1ef1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,255 +1,264 @@ -# $Id$ # Maintainer: Joakim Hernberg # Contributor: Ray Rashif # Contributor: timbosa +# Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler #pkgbase=linux # Build stock -ARCH kernel -pkgbase=linux-rt-lts # Build kernel with a different name -_srcname=linux-4.14 -_pkgver=4.14.71 -_rtpatchver=rt44 +pkgbase=linux-rt-lts # Build kernel with a different name +_pkgver=4.14.93 +_rtpatchver=rt53 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 -arch=('x86_64') -url="https://www.kernel.org/" -license=('GPL2') -makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf') +arch=(x86_64) +url="https://git.archlinux.org/linux.git/log/?h=v$_srcver" +license=(GPL2) +makedepends=(xmlto kmod inetutils bc libelf git python-sphinx graphviz) options=('!strip') +_srcname=linux-${_pkgver} source=( "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.sign" "https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-${_pkgver}-${_rtpatchver}.patch.xz" "https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-${_pkgver}-${_rtpatchver}.patch.sign" - 'config' # the main kernel config file - '60-linux-rt-lts.hook' # pacman hook for depmod - '90-linux-rt-lts.hook' # pacman hook for initramfs regeneration - 'linux-rt-lts.preset' # standard config files for mkinitcpio ramdisk 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - 0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch + config # the main kernel config file + 60-${pkgbase}.hook # pacman hook for depmod + 90-${pkgbase}.hook # pacman hook for initramfs regeneration + ${pkgbase}.preset # standard config files for mkinitcpio ramdisk ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman + '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig) '64254695FFF0AA4466CC19E67B96E8162A8CF5D1' # Sebastian Andrzej Siewior '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt 'E644E2F1D45FA0B2EAA02F33109F098506FF0B14' # Thomas Gleixner ) -sha256sums=('76a4473dbcbd922c23a16130414829a36eb7e2f4e5859bd1b742fffdff907489' +sha256sums=('bb125fb204f7089782e179126121dd0f0aad9f02b7517ce3744982254c221bad' 'SKIP' - '19aee946cce23b9fd3696bd4595b0cd8f0e3b7aae56f8a82fa845eb00faec2b7' + '151bc28f2b33d952dac8b8d5059f18205f89002c9b58a523cdfe2e1a26646d4d' 'SKIP' - '12b73ca9ec3acf9058bf922b60a8773f216cf6e774e21d42a2d09f3013e7a5d2' + '75aa8dd708ca5a0137fbf7cddc9cafefe6aac6b8e0638c06c156d412d05af4bc' + '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06' + '1563a6aff2d3e8e751c4260dd8e6d723be7de8e44a5eb4619935449a79699094' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' - 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - 'd8a865a11665424b21fe6be9265eb287ee6d5646261a486954ddf3a4ee87e78f' - 'ec7342aab478af79a17ff65cf65bbd6744b0caee8f66c77a39bba61a78e6576d' - '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06') + 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') _kernelname=${pkgbase#linux} +: ${_kernelname:=-ARCH} prepare() { - cd linux-${_pkgver} + cd $_srcname - # security patches - - # disable USER_NS for non-root users by default - patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - - # https://bugs.archlinux.org/task/56711 - patch -Np1 -i ../0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - - # add realtime patch + # apply realtime patch msg "applying patch-${_pkgver}-${_rtpatchver}.patch" patch -Np1 -i ../patch-${_pkgver}-${_rtpatchver}.patch - # A patch to fix a problem that ought to be fixed in the NVIDIA source code. - # Stops X from hanging on NVIDIA cards - msg "fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch" - patch -Np1 -i ../fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch - - msg "All patches have successfully been applied" - - cp -Tf ../config .config - - if [ "${_kernelname}" != "" ]; then - sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-${pkgrel}${_kernelname}\"|g" ./.config - sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config - fi - - # set extraversion to pkgrel -# sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile - - # don't run depmod on 'make install'. We'll do this ourselves in packaging - sed -i '2iexit 0' scripts/depmod.sh - - # get kernel version - make prepare + msg2 "Setting version..." + scripts/setlocalversion --save-scmversion + echo "-$pkgrel" > localversion.10-pkgrel + echo "$_kernelname" > localversion.20-pkgname + + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + msg2 "Applying patch $src..." + patch -Np1 < "../$src" + done - # load configuration - # Configure the kernel. Replace the line below with one of your choice. + msg2 "Setting config..." + cp ../config .config + make olddefconfig #make menuconfig # CLI menu for configuration - #make nconfig # new CLI menu for configuration - #make xconfig # X-based configuration - #make oldconfig # using old config from previous kernel version - # ... or manually edit .config - # rewrite configuration - yes "" | make config >/dev/null + make -s kernelrelease > ../version + msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" } build() { - cd linux-${_pkgver} - - make ${MAKEFLAGS} LOCALVERSION= bzImage modules + cd $_srcname + make bzImage modules htmldocs } _package() { pkgdesc="The ${pkgbase/linux/Linux} kernel and modules" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [[ $pkgbase = linux ]] && groups=(base) + depends=(coreutils linux-firmware kmod mkinitcpio) optdepends=('crda: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") - install="${pkgbase}.install" + backup=("etc/mkinitcpio.d/$pkgbase.preset") + install=${pkgbase}.install - cd linux-${_pkgver} + local kernver="$( "${startdir}/${install}.pkg" - true && install=${install}.pkg - - # install mkinitcpio preset file - sed "${_subst}" ../linux-rt-lts.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - sed "${_subst}" ../60-linux-rt-lts.hook | - install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgbase}.hook" - sed "${_subst}" ../90-linux-rt-lts.hook | - install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook" + sed "$subst" "$startdir/$install" > "$startdir/$install.pkg" + true && install=$install.pkg + + # fill in mkinitcpio preset and pacman hooks + sed "$subst" ../${pkgbase}.preset | install -Dm644 /dev/stdin \ + "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" + sed "$subst" ../60-${pkgbase}.hook | install -Dm644 /dev/stdin \ + "$pkgdir/usr/share/libalpm/hooks/60-$pkgbase.hook" + sed "$subst" ../90-${pkgbase}.hook | install -Dm644 /dev/stdin \ + "$pkgdir/usr/share/libalpm/hooks/90-$pkgbase.hook" + + msg2 "Fixing permissions..." + chmod -Rc u=rwX,go=rX "$pkgdir" } _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" - cd linux-${_pkgver} - local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build" + local builddir="$pkgdir/usr/lib/modules/$(/dev/null) + msg2 "Fixing permissions..." + chmod -Rc u=rwX,go=rX "$pkgdir" } _package-docs() { pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" - cd linux-${_pkgver} - local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build" + local builddir="$pkgdir/usr/lib/modules/$(