summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOriginCode2020-12-22 07:55:57 +0800
committerOriginCode2020-12-22 07:55:57 +0800
commitce679a543fafae0478bf4983c652111b311f2ab5 (patch)
treecfa600e2e6c367206320de6fc1f83dff79c1b684
parentfea03a8cb229f6f484f8dbc93a6a112c8b4d7870 (diff)
downloadaur-ce679a543fafae0478bf4983c652111b311f2ab5.tar.gz
linux-froidzen: rm sphinx-workaround.patch
-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 92a888770ae..5233e16f7bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-froidzen
pkgdesc = Linux ZEN with Patches and Modifications
pkgver = 5.10.2.zen1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/zen-kernel/zen-kernel/commits/v5.10.2-zen1
arch = x86_64
license = GPL2
@@ -22,14 +22,12 @@ pkgbase = linux-froidzen
options = !strip
source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.10.2-zen1
source = config
- source = sphinx-workaround.patch
source = https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.10.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
sha256sums = e5d2541532de126a4f243b4cc6f098403a425eb0d76ee59d3ffaf122ac4d8910
- sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = 24729e63e08de13039ce7e6637146ec5a5747379ebbd92cdeef744edfad17183
pkgname = linux-froidzen
diff --git a/PKGBUILD b/PKGBUILD
index 8823e22e073..cbc31e4e6c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=linux-froidzen
pkgver=5.10.2.zen1
-pkgrel=1
+pkgrel=2
pkgdesc='Linux ZEN with Patches and Modifications'
_srctag=v${pkgver%.*}-${pkgver##*.}
url="https://github.com/zen-kernel/zen-kernel/commits/$_srctag"
@@ -18,7 +18,6 @@ _srcname=zen-kernel
source=(
"$_srcname::git+https://github.com/zen-kernel/zen-kernel?signed#tag=$_srctag"
config # the main kernel config file
- sphinx-workaround.patch
"https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.10.patch" # UKSM Patch
)
validpgpkeys=(
@@ -28,7 +27,6 @@ validpgpkeys=(
)
sha256sums=('SKIP'
'e5d2541532de126a4f243b4cc6f098403a425eb0d76ee59d3ffaf122ac4d8910'
- '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'24729e63e08de13039ce7e6637146ec5a5747379ebbd92cdeef744edfad17183')
export KBUILD_BUILD_HOST=archlinux
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
deleted file mode 100644
index 1aa3f1c8f66..00000000000
--- 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']
-