From c2b58c57f8a6489005ceb5442507d0dfde74a574 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 11 Apr 2024 01:45:32 +0000 Subject: [PATCH] Fix the docs build --- .SRCINFO | 3 +++ PKGBUILD | 7 +++++-- docutils.patch | 13 +++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 docutils.patch diff --git a/.SRCINFO b/.SRCINFO index 417533c..8389f2e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -26,6 +26,7 @@ pkgbase = linux source = https://github.com/archlinux/linux/releases/download/v6.8.5-arch1/linux-v6.8.5-arch1.patch.zst source = https://github.com/archlinux/linux/releases/download/v6.8.5-arch1/linux-v6.8.5-arch1.patch.zst.sig source = config + source = docutils.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF @@ -34,11 +35,13 @@ pkgbase = linux sha256sums = 4ad162664e08e57ed8abf44827ecc2fce2eeb38b34988483a9183065a229534e sha256sums = SKIP sha256sums = 2fc20cbd7c4f7f3eeeba73b8e354cecb8757050d2c774992959f93ccde16d667 + sha256sums = 9cb73cacbb3633f207d0c30e738cae9965adcd0b0eb5ecd60563fed1394c0f38 b2sums = 795c67356a7992cc73a85a733471d0379156f7ba68eedd68d4aa099eb07b4eea4626239ae15cdcc409819c833beb1ec2dc4032b203363db52ab1cb8bc31ac4ea b2sums = SKIP b2sums = c4b429ed4508893913c8bd709e8f62496283ba78e5d5bf4d84b734be6d106bd0888341161615af8303f48fb93ce46efda425ff3e56b0e3013c2af4ab95c9428f b2sums = SKIP b2sums = 09628a4dbe1b5cd34fe5e53394c7e44558a7f2c133530f52ae2b6e022f3303d6f8f28f939b13e175a2b4532f7511de26240d26d7dca0543ceaae905d6decb768 + b2sums = 0bb42a22c110f06a45e59a9adc194184a51ff97e5584d6ffabca0aa37e1e65ccaf44f43dc744eaa3861d6f6b00e299d4662bcf0c0d94478af9352b4c4f6b0ffd pkgname = linux pkgdesc = The Linux kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 6784562..cdf0810 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -35,6 +35,7 @@ source=( https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig} config # the main kernel config file + docutils.patch # fix the docs build ) validpgpkeys=( ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds @@ -46,12 +47,14 @@ sha256sums=('138923e5d73748b4bdbe9b5a0b8f36dfac9fcc16753a9222928dc6c963effa89' 'SKIP' '4ad162664e08e57ed8abf44827ecc2fce2eeb38b34988483a9183065a229534e' 'SKIP' - '2fc20cbd7c4f7f3eeeba73b8e354cecb8757050d2c774992959f93ccde16d667') + '2fc20cbd7c4f7f3eeeba73b8e354cecb8757050d2c774992959f93ccde16d667' + '9cb73cacbb3633f207d0c30e738cae9965adcd0b0eb5ecd60563fed1394c0f38') b2sums=('795c67356a7992cc73a85a733471d0379156f7ba68eedd68d4aa099eb07b4eea4626239ae15cdcc409819c833beb1ec2dc4032b203363db52ab1cb8bc31ac4ea' 'SKIP' 'c4b429ed4508893913c8bd709e8f62496283ba78e5d5bf4d84b734be6d106bd0888341161615af8303f48fb93ce46efda425ff3e56b0e3013c2af4ab95c9428f' 'SKIP' - '09628a4dbe1b5cd34fe5e53394c7e44558a7f2c133530f52ae2b6e022f3303d6f8f28f939b13e175a2b4532f7511de26240d26d7dca0543ceaae905d6decb768') + '09628a4dbe1b5cd34fe5e53394c7e44558a7f2c133530f52ae2b6e022f3303d6f8f28f939b13e175a2b4532f7511de26240d26d7dca0543ceaae905d6decb768' + '0bb42a22c110f06a45e59a9adc194184a51ff97e5584d6ffabca0aa37e1e65ccaf44f43dc744eaa3861d6f6b00e299d4662bcf0c0d94478af9352b4c4f6b0ffd') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/docutils.patch b/docutils.patch new file mode 100644 index 0000000..175fb4f --- /dev/null +++ b/docutils.patch @@ -0,0 +1,13 @@ +diff --git i/Documentation/sphinx/kernel_include.py w/Documentation/sphinx/kernel_include.py +index abe768088377..4ba03e5380c6 100755 +--- i/Documentation/sphinx/kernel_include.py ++++ w/Documentation/sphinx/kernel_include.py +@@ -97,7 +97,7 @@ class KernelInclude(Include): + # HINT: this is the only line I had to change / commented out: + #path = utils.relative_path(None, path) + +- path = nodes.reprunicode(path) ++ path = str(path) + encoding = self.options.get( + 'encoding', self.state.document.settings.input_encoding) + e_handler=self.state.document.settings.input_encoding_error_handler