From 57ff155b5855d750091bad4650a466e74b4fc4fa Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Sat, 20 Jul 2019 00:43:00 -0400
Subject: upgpkg: libre/linux-libre 5.2.1_gnu-1

Signed-off-by: David P <megver83@parabola.nu>
---
 libre/linux-libre/PKGBUILD | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'libre/linux-libre/PKGBUILD')

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index c92158757..468bfba67 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -11,8 +11,8 @@
 
 pkgbase=linux-libre         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_srcbasever=5.1-gnu
-_srcver=5.1.6-gnu
+_srcbasever=5.2-gnu
+_srcver=5.2.1-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -22,11 +22,14 @@ _srcname=linux-${_srcbasever%-*}
 _archpkgver=${_srcver%-*}
 pkgver=${_srcver//-/_}
 pkgrel=1
-rcnrel=armv7-x5
+rcnrel=armv7-x2
 arch=(i686 x86_64 armv7h)
 url='https://linux-libre.fsfla.org/'
 license=(GPL2)
-makedepends=(xmlto kmod inetutils bc libelf)
+makedepends=(
+  xmlto kmod inetutils bc libelf python-sphinx python-sphinx_rtd_theme
+  graphviz imagemagick
+)
 makedepends_armv7h=(uboot-tools vboot-utils dtc) # for linux-libre-chromebook
 options=('!strip')
 source=(
@@ -49,10 +52,19 @@ source=(
 
   # Arch's custom linux patches
   0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+  0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
+  0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
 )
 source_armv7h=(
   # armv7h patches, put in the source_armv7h variable just for a more comfortable loop patching
+
+  # RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
+  # Note: For stability reasons, AUFS has been removed in the RCN patch.
+  # We are supporting AUFS in linux-libre-pck through PCK patch.
+  # See https://wiki.parabola.nu/PCK for further details.
   "https://repo.parabola.nu/other/rcn-libre/patches/${_srcver%-*}/rcn-libre-${_srcver%-*}-$rcnrel.patch"{,.sig}
+
+  # Arch Linux ARM patches
   0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
   0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
   0003-SMILE-Plug-device-tree-file.patch
@@ -127,10 +139,6 @@ prepare() {
   echo "$_kernelname" > localversion.20-pkgname
 
   if [ "$CARCH" = "armv7h" ]; then
-    # RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
-    # Note: For stability reasons, AUFS has been removed in the RCN patch.
-    # We are supporting AUFS in linux-libre-pck through PCK patch.
-    # See https://wiki.parabola.nu/PCK for further details.
     local src_armv7h
     for src_armv7h in "${source_armv7h[@]}"; do
       src_armv7h="${src_armv7h%%::*}"
@@ -161,9 +169,9 @@ prepare() {
 build() {
   cd $_srcname
   if [ "$CARCH" = "armv7h" ]; then
-    make zImage modules dtbs
+    make zImage modules htmldocs dtbs
   elif [ "$CARCH" = "x86_64" ] || [ "$CARCH" = "i686" ]; then
-    make bzImage modules
+    make bzImage modules htmldocs
   fi
 }
 
@@ -357,6 +365,18 @@ _package-docs() {
   mkdir -p "$builddir"
   cp -t "$builddir" -a Documentation
 
+  msg2 "Removing doctrees..."
+  rm -r "$builddir/Documentation/output/.doctrees"
+
+  msg2 "Moving HTML docs..."
+  local src dst
+  while read -rd '' src; do
+    dst="$builddir/Documentation/${src#$builddir/Documentation/output/}"
+    mkdir -p "${dst%/*}"
+    mv "$src" "$dst"
+    rmdir -p --ignore-fail-on-non-empty "${src%/*}"
+  done < <(find "$builddir/Documentation/output" -type f -print0)
+
   msg2 "Adding symlink..."
   mkdir -p "$pkgdir/usr/share/doc"
   ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
-- 
cgit v1.2.3