summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2020-09-12 19:30:17 +0200
committerPiotr Gorski2020-09-12 19:30:17 +0200
commitc1e17c0c7956bcb7d5dd31ecf920658588c536ae (patch)
treef2b4797d2402fdcf36c9789db027dd9b3897e890
parentcf471f9dcc3cd5edb91c61c2c6efa95c1cc8ef2d (diff)
downloadaur-c1e17c0c7956bcb7d5dd31ecf920658588c536ae.tar.gz
Drop sphinx-workaround.patch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--sphinx-workaround.patch13
3 files changed, 2 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c7837da43d4f..e34d9ce44127 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-next-git
pkgdesc = Linux NEXT
- pkgver = 20200903.r0.g7a6956579ce6
+ pkgver = 20200911.r0.gd5b2251d63b5
pkgrel = 1
url = http://www.kernel.org/
arch = x86_64
@@ -17,11 +17,9 @@ pkgbase = linux-next-git
options = !strip
source = git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.9-rc/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = sphinx-workaround.patch
source = config
sha512sums = SKIP
sha512sums = 6be8788bfa09f67273682cba1c4566cd1dc48b162c193a482d6565148779c80b6fb2fbe73d2d417dd9e53ca7a69d4ac2012fc98a48a8a0fcd5ac05161e7539c5
- sha512sums = 98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be
sha512sums = fc9c8e06d20fa99baa1e066ca04fdc715635e10c24d1f1551b9a191a0e8eaf775293200483a9213268b6710820570bbbd757db33213713a3ff9e594ad5962943
pkgname = linux-next-git
diff --git a/PKGBUILD b/PKGBUILD
index c21f0a84b6c6..91c3f0261e9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,7 @@ _1k_HZ_ticks=
### Do not edit below this line unless you know what you're doing
pkgbase=linux-next-git
-pkgver=20200903.r0.g7a6956579ce6
+pkgver=20200911.r0.gd5b2251d63b5
_srcname=linux-next
pkgrel=1
pkgdesc='Linux NEXT'
@@ -63,7 +63,6 @@ _lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_lucjanver
source=("git://git.kernel.org/pub/scm/linux/kernel/git/next/${_srcname}.git"
"${_lucjanpath}/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
- 'sphinx-workaround.patch'
# the main kernel config files
'config')
@@ -314,5 +313,4 @@ done
sha512sums=('SKIP'
'6be8788bfa09f67273682cba1c4566cd1dc48b162c193a482d6565148779c80b6fb2fbe73d2d417dd9e53ca7a69d4ac2012fc98a48a8a0fcd5ac05161e7539c5'
- '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be'
'fc9c8e06d20fa99baa1e066ca04fdc715635e10c24d1f1551b9a191a0e8eaf775293200483a9213268b6710820570bbbd757db33213713a3ff9e594ad5962943')
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']
-