summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-01-01 16:54:31 +0100
committerErich Eckner <git@eckner.net>2021-01-01 16:54:31 +0100
commit5d9c395a5ab54480155a0a73053dbdfda3ccab29 (patch)
tree16b690ed2c52c941287c5376a99428e2c4cca359
parenta1e10c6ca95bf013b0136bd8710b168f1bf64c2b (diff)
downloadpackages-5d9c395a5ab54480155a0a73053dbdfda3ccab29.tar.xz
extra/linux-olpc-xo1: remove obsolete patch
-rw-r--r--extra/linux-olpc-xo1/PKGBUILD4
-rw-r--r--extra/linux-olpc-xo1/sphinx-workaround.patch13
2 files changed, 1 insertions, 16 deletions
diff --git a/extra/linux-olpc-xo1/PKGBUILD b/extra/linux-olpc-xo1/PKGBUILD
index b5e2cb81..46c15291 100644
--- a/extra/linux-olpc-xo1/PKGBUILD
+++ b/extra/linux-olpc-xo1/PKGBUILD
@@ -19,7 +19,6 @@ _srcname=archlinux-linux
source=(
"$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag"
config.${MODEL} # the main kernel config file
- sphinx-workaround.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -27,8 +26,7 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('33e79fec8e873aefe465702afd4a7d5300b6c4b7bd801325867dd8c58c0c4ee1'
- '18730a94777487843be91aff97ca7553e6a666219c810fc570a920f877877c1d'
- '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
+ '18730a94777487843be91aff97ca7553e6a666219c810fc570a920f877877c1d')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/extra/linux-olpc-xo1/sphinx-workaround.patch b/extra/linux-olpc-xo1/sphinx-workaround.patch
deleted file mode 100644
index 1aa3f1c8..00000000
--- a/extra/linux-olpc-xo1/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']
-