sys-kernel/linux-docs: use the right tarball

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
Mike Gilbert
2023-04-04 15:16:59 -04:00
parent 00e3bbb4ad
commit f8ee5efcc1
3 changed files with 2 additions and 53 deletions

View File

@@ -1 +1 @@
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.15.105.tar.xz 126525736 BLAKE2B f0175a21ada81910bf4dd176f1c6674244e8ed9294f4e19e89be73ae12e91c183479e0e0604c9c52c48f2e549ca1d4e01c5eb32a2333aefc82be8bf4160befed SHA512 f133d664431b82d995442878a155d77c624de0ccc02704198b5db27e170d55c3759f88091279cf9d91f717326b5304e0cfe0aa8253ac5d89bdeb7d6ab344b3e2

View File

@@ -1,46 +0,0 @@
From 0283189e8f3d0917e2ac399688df85211f48447b Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Wed, 4 Jan 2023 10:47:39 -0700
Subject: [PATCH] docs: Fix the docs build with Sphinx 6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sphinx 6.0 removed the execfile_() function, which we use as part of the
configuration process. They *did* warn us... Just open-code the
functionality as is done in Sphinx itself.
Tested (using SPHINX_CONF, since this code is only executed with an
alternative config file) on various Sphinx versions from 2.5 through 6.0.
Reported-by: Martin Liška <mliska@suse.cz>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
Documentation/sphinx/load_config.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx/load_config.py
index eeb394b39e2cc8..8b416bfd75ac17 100644
--- a/Documentation/sphinx/load_config.py
+++ b/Documentation/sphinx/load_config.py
@@ -3,7 +3,7 @@
import os
import sys
-from sphinx.util.pycompat import execfile_
+from sphinx.util.osutil import fs_encoding
# ------------------------------------------------------------------------------
def loadConfig(namespace):
@@ -48,7 +48,9 @@ def loadConfig(namespace):
sys.stdout.write("load additional sphinx-config: %s\n" % config_file)
config = namespace.copy()
config['__file__'] = config_file
- execfile_(config_file, config)
+ with open(config_file, 'rb') as f:
+ code = compile(f.read(), fs_encoding, 'exec')
+ exec(code, config)
del config['__file__']
namespace.update(config)
else:

View File

@@ -5,8 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10,11} )
inherit linux-info python-any-r1 toolchain-funcs
MY_PV="$(ver_cut 1-2)"
MY_P=linux-${MY_PV}
MY_P=linux-${PV}
S=${WORKDIR}/${MY_P}
@@ -27,10 +26,6 @@ BDEPEND="${PYTHON_DEPS}
dev-python/sphinx-rtd-theme
media-libs/fontconfig"
PATCHES=(
"${FILESDIR}/${PN}-sphinx-6.0.patch"
)
src_prepare() {
default
# Fix the Python shebangs.