summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Eriksson2020-10-26 09:10:58 +0100
committerMikael Eriksson2020-10-26 11:34:28 +0100
commiteb6229a1df7103765092762e76a68954792a2108 (patch)
tree424cb7f19c6f6522ef4166bff524c01b0429bd2f
parent3750ddc85c147f5193eee22ba8daa6ef3231504f (diff)
downloadaur-eb6229a1df7103765092762e76a68954792a2108.tar.gz
5.10rc1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--sphinx-workaround.patch13
3 files changed, 6 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4856409a2757..ebf673993296 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-mainline
pkgdesc = Linux Mainline
- pkgver = 5.9
+ pkgver = 5.10rc1
pkgrel = 1
url = https://kernel.org/
arch = x86_64
@@ -16,15 +16,13 @@ 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.9
+ source = linux-mainline::git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v5.10-rc1
source = config
- source = sphinx-workaround.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
- sha256sums = 457d5c9717048cd5334ba3d14dfb37699ac1d2c6dc2fd1df93adb487d6921f2f
- sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
+ sha256sums = 36439a90c9d2f860298d90e141f3bf9d897dd8ece9e21cd46508f4ed7b2151bb
pkgname = linux-mainline
pkgdesc = The Linux Mainline kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index ace6869b0da7..cce6687e5d9e 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.9
-pkgver=5.9
+_tag=v5.10-rc1
+pkgver=5.10rc1
pkgrel=1
pkgdesc="Linux Mainline"
arch=(x86_64)
@@ -25,7 +25,6 @@ _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
@@ -33,8 +32,7 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- '457d5c9717048cd5334ba3d14dfb37699ac1d2c6dc2fd1df93adb487d6921f2f'
- '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
+ '36439a90c9d2f860298d90e141f3bf9d897dd8ece9e21cd46508f4ed7b2151bb')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
deleted file mode 100644
index 1aa3f1c8f66e..000000000000
--- a/sphinx-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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']
-