summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Eriksson2020-04-12 23:14:22 +0200
committerMikael Eriksson2020-04-12 23:14:22 +0200
commitaa1be8eaff0022183c0bfabaf5f9b930a6f65384 (patch)
tree4dd7f92d9cac2e38f654f662d44b713ca701b4df
parentb0982a8cc8438d8f984f2506fa27add885311b82 (diff)
downloadaur-aa1be8eaff0022183c0bfabaf5f9b930a6f65384.tar.gz
5.7rc1-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--sphinx-workaround.patch13
3 files changed, 23 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2dbb5068b387..263f256be03a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-mainline
pkgdesc = Linux Mainline
- pkgver = 5.6
+ pkgver = 5.7rc1
pkgrel = 1
url = https://kernel.org/
arch = x86_64
@@ -15,13 +15,15 @@ pkgbase = linux-mainline
makedepends = imagemagick
makedepends = git
options = !strip
- source = linux-mainline::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v5.6
+ source = linux-mainline::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v5.7-rc1
source = config
+ source = sphinx-workaround.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = f40b1d707ee1199275a7ad0e456e67e39fba7bd41e9a3921af26e7fd1bf08a27
+ sha256sums = 6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c
+ sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
pkgname = linux-mainline
pkgdesc = The Linux Mainline kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 47eac58517e5..4fc83e66f354 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
pkgbase=linux-mainline # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name
-_tag=v5.6
-pkgver=5.6
+_tag=v5.7-rc1
+pkgver=5.7rc1
pkgrel=1
pkgdesc="Linux Mainline"
arch=(x86_64)
@@ -25,6 +25,7 @@ _srcname=linux-mainline
source=(
"$_srcname::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=$_tag"
config # the main kernel config file
+ sphinx-workaround.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -32,7 +33,8 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'f40b1d707ee1199275a7ad0e456e67e39fba7bd41e9a3921af26e7fd1bf08a27')
+ '6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c'
+ '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 000000000000..1aa3f1c8f66e
--- /dev/null
+++ b/sphinx-workaround.patch
@@ -0,0 +1,13 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index 3c7bdf4cd31f..9a0ced58a3e9 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -36,7 +36,7 @@ needs_sphinx = '1.3'
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
+ 'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
+ 'maintainers_include']
+