From ea05b30f574ccc9828c1f888d4ad45b8fc744547 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Tue, 7 Apr 2020 11:03:45 +0200
Subject: PKGBUILD: Addin patch for python-sphinx.

Cleaning up the build script to be in line with current core/linux-lts.
Simplifying the discovery of the RT patch.
---
 .SRCINFO | 10 +++++-----
 PKGBUILD | 28 ++++++++++++++++------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 3ad5b9b..19f0e6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,7 @@
 pkgbase = linux-rt-lts
+	pkgdesc = Linux RT LTS
 	pkgver = 4.19.106.46
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.linuxfoundation.org/realtime/start
 	arch = x86_64
 	license = GPL2
@@ -8,7 +9,6 @@ pkgbase = linux-rt-lts
 	makedepends = git
 	makedepends = graphviz
 	makedepends = imagemagick
-	makedepends = inetutils
 	makedepends = kmod
 	makedepends = libelf
 	makedepends = python-sphinx
@@ -35,7 +35,7 @@ pkgbase = linux-rt-lts
 	sha256sums = a13581d3c6dc595206e4fe7fcf6b542e7a1bdbe96101f0f010fc5be49f99baf2
 
 pkgname = linux-rt-lts
-	pkgdesc = The Linux-rt-lts kernel and modules
+	pkgdesc = The Linux RT LTS kernel and modules
 	depends = coreutils
 	depends = kmod
 	depends = initramfs
@@ -43,8 +43,8 @@ pkgname = linux-rt-lts
 	optdepends = linux-firmware: firmware images needed for some devices
 
 pkgname = linux-rt-lts-headers
-	pkgdesc = Header files and scripts for building modules for Linux-rt-lts kernel
+	pkgdesc = Headers and scripts for building modules for the Linux RT LTS kernel
 
 pkgname = linux-rt-lts-docs
-	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-rt-lts kernel
+	pkgdesc = Documentation for the Linux RT LTS kernel
 
diff --git a/PKGBUILD b/PKGBUILD
index 3ddeeb8..1e8ef86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,12 @@ _pkgver=4.19.106
 _rtpatchver=46
 pkgbase=linux-rt-lts
 pkgver=${_pkgver}.${_rtpatchver}
-pkgrel=1
+pkgrel=2
+pkgdesc='Linux RT LTS'
 arch=('x86_64')
 url="https://wiki.linuxfoundation.org/realtime/start"
 license=('GPL2')
-makedepends=('bc' 'git' 'graphviz' 'imagemagick' 'inetutils' 'kmod' 'libelf'
+makedepends=('bc' 'git' 'graphviz' 'imagemagick' 'kmod' 'libelf'
 'python-sphinx' 'python-sphinx_rtd_theme' 'xmlto')
 options=('!strip')
 _srcname=linux-${_pkgver}
@@ -43,10 +44,6 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 prepare() {
   cd $_srcname
 
-  # apply realtime patch
-  msg "applying patch-${_pkgver}-rt${_rtpatchver}.patch"
-  patch -Np1 -i "../patch-${_pkgver}-rt${_rtpatchver}.patch"
-
   echo "Setting version..."
   scripts/setlocalversion --save-scmversion
   echo "-$pkgrel" > localversion.10-pkgrel
@@ -56,27 +53,34 @@ prepare() {
   for src in "${source[@]}"; do
     src="${src%%::*}"
     src="${src##*/}"
+    # picking up the RT patch
+    src="${src//patch.xz/patch}"
     [[ $src = *.patch ]] || continue
     echo "Applying patch $src..."
     patch -Np1 < "../$src"
   done
 
+  # removing cdomain configuration (incompatible with python-sphinx >= 3.0.0):
+  # https://github.com/sphinx-doc/sphinx/issues/7421
+  sed -e "s/'cdomain',//" -i Documentation/conf.py
+
   echo "Setting config..."
   cp ../config .config
   make olddefconfig
 #  make menuconfig # CLI menu for configuration
 
   make -s kernelrelease > version
-  echo "Prepared %s version %s" "$pkgbase" "$(<version)"
+  echo "Prepared $pkgbase version $(<version)"
 }
 
 build() {
   cd $_srcname
-  make bzImage modules htmldocs
+  make all
+  make htmldocs
 }
 
 _package() {
-  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules"
+  pkgdesc="The $pkgdesc kernel and modules"
   depends=(coreutils kmod initramfs)
   optdepends=('crda: to set the correct wireless channels of your country'
               'linux-firmware: firmware images needed for some devices')
@@ -104,7 +108,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
+  pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
 
   cd $_srcname
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -122,7 +126,7 @@ _package-headers() {
   # add xfs and shmem for aufs building
   mkdir -p "$builddir"/{fs/xfs,mm}
 
-  # this is gone in v5.3
+  # TODO: remove with linux > 5.3
   mkdir "$builddir/.tmp_versions"
 
   echo "Installing headers..."
@@ -185,7 +189,7 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
+  pkgdesc="Documentation for the $pkgdesc kernel"
 
   cd $_srcname
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
-- 
cgit v1.2.3