From 9c3d5bed5df6f396d1972c4d488bc099a36f5938 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 20 Feb 2021 02:13:26 -0800
Subject: Updated to 5.10.17

---
 PKGBUILD                | 54 +++++++++++++++++++++++++------------------------
 config                  |  2 +-
 sphinx-workaround.patch | 19 +++++++++++++++++
 3 files changed, 48 insertions(+), 27 deletions(-)
 create mode 100644 sphinx-workaround.patch

diff --git a/PKGBUILD b/PKGBUILD
index 75401ff..9cd0e16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _pkgbase=linux-hardened
 pkgbase=linux-libre-hardened
 _supver=5
 _majver=10
-_minver=16
+_minver=17
 _gccpatchver='20201113'
 _gccpatchger='10.1'
 _gccpatchker='5.8'
@@ -49,6 +49,7 @@ source=(
   https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
   https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}-${_hardenedver}/${_pkgbase}-${pkgver}-${_hardenedver}.patch{,.sig}
   config         # the main kernel config file
+  sphinx-workaround.patch # Sphinx 3.5 broke the build again
   0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
@@ -63,14 +64,15 @@ validpgpkeys=(
 )
 b2sums=('86103699a6bc906e85429430df098b0ddb7cfc8c887f98b37f994498388d634554e119eadb1b15f591bdf4f463e7efb7420e3e370af0029b7ed9e988a5f26b01'
         'SKIP'
-        'a1d0af339603b63804818e10d96401b9321a026ca619e8eeaff3c7dfd0cc778de11359710075ea5648780b57aff56af931d3d9ee1d32258468b34215159b8972'
+        '782a07c9b7b8e8e425e62c72458ae2babd489800180ea9af2ace43f290fb31dad1234eb6dea0db0e1507d3abfb4fa3d41107d7e8019a85205b55acc02179f732'
         'SKIP'
-        '7d755aa53f672b988914c84f1946ad2a15fd3af469f430d1972237c4ce82b3ac37ad034de748e5937ec262f630f9aa6749704eabe3c095320447a4de5d4b2d46'
+        'cefec4c8e794d53cd33ff54288647e696ee345bab140b271b19ba215cc6ae1900d5e21c0d3034d040cb6f6de307833c6df393b2edf88417f2505b3d8f37586e3'
+        'db64b425139c107c69f44624901ae50b5e604d4c9fdfe84f78c298f8ed7a7739033a72ec678c5c3c0e82e59809d97799d0c25f96c64ef5ae79910cb890fc7bfb'
         'd8297e09f552a2d6bb24c2ba10481fd2b407057f3b24278e72a89233473460d339c83838791989773623178b5af80588fb4c484da2931f1040e313cce7ceca00'
         '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127'
         'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
-        '0b54ec87bcc287cc9af09e296b233695f329edade78eac0faf9a42969e82a61c3d212f3c98836b7d1a5a48caa74cfa6192ce651b00d5bddbf1c8bc3d49d031bd'
+        '72de1345d33b9e1819d2a0124728cbfa5d0e74425196c9aef319b91a9e60a7d6d56c508b949107722289adcc8db37973420486121ed964987af18de489627ca5'
         'SKIP')
 
 export KBUILD_BUILD_HOST=arc4linux
@@ -93,6 +95,7 @@ prepare() {
   # Hotfixes
   echo "Applying hotfixes"
   patch -p1 -i ../0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
+  patch -p1 -i ../sphinx-workaround.patch
 
 
   # linux hardened patch
@@ -162,7 +165,7 @@ prepare() {
 build() {
   cd $_srcname
   make all
-  #make htmldocs
+  make htmldocs
 }
 
 _package() {
@@ -273,27 +276,26 @@ _package-headers() {
   ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-#_package-docs() {
-#  pkgdesc="Documentation for the $pkgdesc kernel"
-#
-#  cd $_srcname
-#  local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
-#
-#  echo "Installing documentation..."
-#  local src dst
-#  while read -rd '' src; do
-#    dst="${src#Documentation/}"
-#    dst="$builddir/Documentation/${dst#output/}"
-#    install -Dm644 "$src" "$dst"
-#  done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
-#
-#  echo "Adding symlink..."
-#  mkdir -p "$pkgdir/usr/share/doc"
-#  ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
-#}
-
-#pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
-pkgname=("$pkgbase" "$pkgbase-headers")
+_package-docs() {
+  pkgdesc="Documentation for the $pkgdesc kernel"
+
+  cd $_srcname
+  local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+
+  echo "Installing documentation..."
+  local src dst
+  while read -rd '' src; do
+    dst="${src#Documentation/}"
+    dst="$builddir/Documentation/${dst#output/}"
+    install -Dm644 "$src" "$dst"
+  done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
+
+  echo "Adding symlink..."
+  mkdir -p "$pkgdir/usr/share/doc"
+  ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
+}
+
+pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {
     $(declare -f "_package${_p#$pkgbase}")
diff --git a/config b/config
index 51396fb..3b97722 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.6 Kernel Configuration
+# Linux/x86 5.10/17 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 0000000..a6e2c49
--- /dev/null
+++ b/sphinx-workaround.patch
@@ -0,0 +1,19 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index 6a767294887e..d1d145759fed 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -267,11 +267,9 @@ except ImportError:
+ 
+ html_static_path = ['sphinx-static']
+ 
+-html_context = {
+-    'css_files': [
+-        '_static/theme_overrides.css',
+-    ],
+-}
++html_css_files = [
++    '_static/theme_overrides.css',
++]
+ 
+ # Add any extra paths that contain custom files (such as robots.txt or
+ # .htaccess) here, relative to this directory. These files are copied
-- 
cgit v1.2.1