summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge2021-03-13 13:15:06 +0100
committerDavid Runge2021-03-13 13:15:06 +0100
commitd29680a2e2fdf9222b009a72156a4f0c57d8d7b8 (patch)
tree1f83a952b3b4634e1fe5a33bd8af7059052306c1
parent5a60a28624d69cd8773c82d72809dcaa52626eae (diff)
downloadaur-d29680a2e2fdf9222b009a72156a4f0c57d8d7b8.tar.gz
Upgrade to 5.11.4.11.arch1
PKGBUILD: Upgrade to 5.11.4.11.arch1 config: Reconfigure against 5.11.4 and align with core/linux sphinx-workaround.patch: Remove patch again, as it 5.11.4 can build the docs using python-sphinx 3.5.2.
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD9
-rw-r--r--config9
-rw-r--r--sphinx-workaround.patch19
4 files changed, 12 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2b3bea71803..a2b8bd29a030 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-rt
pkgdesc = Linux RT
- pkgver = 5.11.2.9.arch1
+ pkgver = 5.11.4.11.arch1
pkgrel = 1
url = https://wiki.linuxfoundation.org/realtime/start
arch = x86_64
@@ -16,18 +16,15 @@ pkgbase = linux-rt
makedepends = python-sphinx_rtd_theme
makedepends = xmlto
options = !strip
- source = git+https://gitlab.archlinux.org/dvzrv/linux-rt#tag=v5.11.2.9.arch1?signed
+ source = git+https://gitlab.archlinux.org/dvzrv/linux-rt#tag=v5.11.4.11.arch1?signed
source = config
- source = sphinx-workaround.patch
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
validpgpkeys = C7E7849466FE2358343588377258734B41C31549
sha512sums = SKIP
- sha512sums = 8ae844fea84cec1f8349d1365725b7e27b86f63bfbc72b65446c40c0c5212ac625383e1641b3c8fbe2ada55d511881573ae0489b5a3c2b1f59dc1770b459e81e
- sha512sums = 93c03382b6678ce5e94a5d06e6737965629d7dc49d16e968d225e664d88f07a12abe0e04908f1cdaa75ff1cde88783cae9f0794d1075bc65bc7baeff392e0ae2
+ sha512sums = 977ac2ff9c344619758aa30aeb1c9fd6ad2777c99774a5a2b6956cd85c38640a00a4f292a53195fca15e645e2cba3bb725a4d0ca043b3a03261d456504512824
b2sums = SKIP
- b2sums = aba2bbf351c963b1e59e24713779b22241c3fd43fa7774196e70d4df113c227f9c9862a4b192397b62a19a696d1dc5bc842aa1694c02b4051137cd1f10fc181d
- b2sums = db64b425139c107c69f44624901ae50b5e604d4c9fdfe84f78c298f8ed7a7739033a72ec678c5c3c0e82e59809d97799d0c25f96c64ef5ae79910cb890fc7bfb
+ b2sums = 56cd37f1ac075db2cd4b30a9bb2bedcb0a9c4648cc23e408a121a529d090b894c7e919b9ea996e30ca23f559fde6172594935af3083e69ce5e1c62719e3658fa
pkgname = linux-rt
pkgdesc = The Linux RT kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index a44807a1feab..626acaa13bfa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Joakim Hernberg <jbh@alchemy.lu>
pkgbase=linux-rt
-pkgver=5.11.2.9.arch1
+pkgver=5.11.4.11.arch1
pkgrel=1
pkgdesc='Linux RT'
arch=('x86_64')
@@ -14,14 +14,11 @@ options=('!strip')
source=(
"git+https://gitlab.archlinux.org/dvzrv/linux-rt#tag=v${pkgver}?signed"
config
- sphinx-workaround.patch # Sphinx 3.5 broke the build again
)
sha512sums=('SKIP'
- '8ae844fea84cec1f8349d1365725b7e27b86f63bfbc72b65446c40c0c5212ac625383e1641b3c8fbe2ada55d511881573ae0489b5a3c2b1f59dc1770b459e81e'
- '93c03382b6678ce5e94a5d06e6737965629d7dc49d16e968d225e664d88f07a12abe0e04908f1cdaa75ff1cde88783cae9f0794d1075bc65bc7baeff392e0ae2')
+ '977ac2ff9c344619758aa30aeb1c9fd6ad2777c99774a5a2b6956cd85c38640a00a4f292a53195fca15e645e2cba3bb725a4d0ca043b3a03261d456504512824')
b2sums=('SKIP'
- 'aba2bbf351c963b1e59e24713779b22241c3fd43fa7774196e70d4df113c227f9c9862a4b192397b62a19a696d1dc5bc842aa1694c02b4051137cd1f10fc181d'
- 'db64b425139c107c69f44624901ae50b5e604d4c9fdfe84f78c298f8ed7a7739033a72ec678c5c3c0e82e59809d97799d0c25f96c64ef5ae79910cb890fc7bfb')
+ '56cd37f1ac075db2cd4b30a9bb2bedcb0a9c4648cc23e408a121a529d090b894c7e919b9ea996e30ca23f559fde6172594935af3083e69ce5e1c62719e3658fa')
validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman <gregkh@kernel.org>
'64254695FFF0AA4466CC19E67B96E8162A8CF5D1' # Sebastian Andrzej Siewior
diff --git a/config b/config
index 0b6ac917e36e..a03ddb0b8123 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.11.2 Kernel Configuration
+# Linux/x86 5.11.4 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -264,6 +264,7 @@ CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
CONFIG_USERFAULTFD=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
@@ -4888,9 +4889,9 @@ CONFIG_SENSORS_MAX31785=m
CONFIG_SENSORS_MAX34440=m
CONFIG_SENSORS_MAX8688=m
CONFIG_SENSORS_MP2975=m
-# CONFIG_SENSORS_PM6764TR is not set
+CONFIG_SENSORS_PM6764TR=m
CONFIG_SENSORS_PXE1610=m
-# CONFIG_SENSORS_Q54SJ108A2 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
CONFIG_SENSORS_TPS40422=m
CONFIG_SENSORS_TPS53679=m
CONFIG_SENSORS_UCD9000=m
@@ -7887,7 +7888,7 @@ CONFIG_DMA_ACPI=y
CONFIG_ALTERA_MSGDMA=m
CONFIG_INTEL_IDMA64=m
CONFIG_INTEL_IDXD=m
-# CONFIG_INTEL_IDXD_SVM is not set
+CONFIG_INTEL_IDXD_SVM=y
CONFIG_INTEL_IOATDMA=m
CONFIG_PLX_DMA=m
CONFIG_XILINX_ZYNQMP_DPDMA=m
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
deleted file mode 100644
index a6e2c4900290..000000000000
--- a/sphinx-workaround.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git i/Documentation/conf.py w/Documentation/conf.py
-index 6a767294887e..d1d145759fed 100644
---- i/Documentation/conf.py
-+++ w/Documentation/conf.py
-@@ -267,11 +267,9 @@ except ImportError:
-
- html_static_path = ['sphinx-static']
-
--html_context = {
-- 'css_files': [
-- '_static/theme_overrides.css',
-- ],
--}
-+html_css_files = [
-+ '_static/theme_overrides.css',
-+]
-
- # Add any extra paths that contain custom files (such as robots.txt or
- # .htaccess) here, relative to this directory. These files are copied