updpkg: libre/linux-libre-pck 5.11.2.pck1-1

-docs package disabled due to an issue with sphinx

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 31 insertions, 28 deletions

diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD
index 8572c82a4..dede0600c 100644
--- a/libre/linux-libre-pck/PKGBUILD
+++ b/libre/linux-libre-pck/PKGBUILD
@@ -9,46 +9,48 @@
 
 # Based on linux-zen package
 
+# NOTE: Don't build htmldocs due to an error in sphinx
+
 _replacesarchkernel=('linux-zen')
 _replacesoldkernels=()
 _replacesoldmodules=()
 
 pkgbase=linux-libre-pck
-pkgver=5.8.13.pck1
+pkgver=5.11.2.pck1
 pkgrel=1
 pkgdesc='Linux-libre PCK'
 url='https://wiki.parabola.nu/PCK'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
 makedepends=(
-  bc kmod libelf pahole
-  xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
+  bc kmod libelf pahole cpio perl tar xz
+#  xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
 )
 options=('!strip')
-_srcname=linux-5.8
+_srcname=linux-5.11
 source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu.xz"{,.sign}
   "https://repo.parabola.nu/other/pck/patches/${pkgver%.*}-gnu/patch-${pkgver%.*}-gnu-${pkgver##*.}.patch"{,.sig}
   config.i686 config.x86_64 config.armv7h    # the main kernel config files
   linux-armv7h.preset                        # armv7h preset file for mkinitcpio ramdisk
-  sphinx-workaround.patch
+  sphinx-workaround.patch                    # Sphinx 3.5 broke the build again
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
 )
-sha512sums=('ee31b02ebb50fb061f58c9d6011c2fcda93931b2b443adb19916928a4ea1c8e60a953781f627d4fc25d0f095fa54ff78cd75850ed3a2128bbb42c6e4246af0d6'
+sha512sums=('3a34006add9ea318b0c2863388925ba34d57d342535b00c9ebc61fbfc69ef206b64af21c35b101466508c4308b5da310743c8add74dd703e259612953104ae43'
             'SKIP'
-            '887b0aabea2fb3cc00dfe7bcfc068cc6e8f57dfb2b23f34b3dec3f0e124b438c0115f78d31fedb089ebbb3f546a629ddf4ffddf8f1cc4ba04fc5d5a81be7c87c'
+            '64c5a9076b502d3da538e781f3819af24ddb90316c2d181037c0f77e5204ec555aa0464d58fbd0025ee6c4f1b28db33d38ddc8de0bc2a83be9190c900fdf6a2c'
             'SKIP'
-            '6e409443c2d5367c9727d901eac3858802897baa26530b91ac08a6c78a4e1d6557f7a7807a198b2ecb1a98c1d40497929e3dc469e921795d9dab9273c4ea713c'
+            'aa1246017a89560d8def2008fc18b8c49bf0856b4c40bb29a6b3aef9c155826bfcaf4ccc47ece317ddf6ceb02965c8a670af9400ffdfb37264a75af9fa81f1e6'
             'SKIP'
-            '8b2114bd0ac9cc04f830076783bb63ac10f018a50e3c3b71d3f0d71da7dad2179811bb481926607e86069fd0ae36b87cc4351aea51cac7be84a65b33dd36a3c8'
-            'acaeb22dda3c6045fd858e38cda5997f19541d993b96481dff8e8fd6a5b45f291b8c2c14a98b06b2e4d3284924a418e3f7af87dacc0eaea7aed4a0bc03177f74'
-            'a0838a3c3404c71a4ab28d00a96a20565ed68776b8725f1dd0457a82fda16562f8e0044c93faa8fd82af817ba8088c9cc84c926a14a982d83e0230f40f479149'
+            '4ad88cc7f1abf047c533f81e84348a10deef7d149c65677c1b6e234798477cfccde11297563353649799ea66c4273d800e5ec8e57e3f4911caeaf01b90424984'
+            'c14ee0e7006d82d8de886d75b48f672e43c889493e8b56566486c3c1a2ee08409b62bc22879c44d4a5cd18b4935d0f53adf8d3e53c71a8586253cdbf44ad0210'
+            '6728253ca04a603ef35ceb06b284c509d8ffda6a8c6403fe687afe5d956425588ebbd62bfc5dd1d7fd9a03071a30c7cd86ac72a1fd67cbbf1ebdac85ee703caf'
             '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'
-            '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be')
+            '93c03382b6678ce5e94a5d06e6737965629d7dc49d16e968d225e664d88f07a12abe0e04908f1cdaa75ff1cde88783cae9f0794d1075bc65bc7baeff392e0ae2')
 
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
 _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}")
@@ -96,7 +98,7 @@ prepare() {
 build() {
   cd $_srcname
   make all
-  make htmldocs
+#  make htmldocs
 }
 
 _package() {
@@ -106,8 +108,8 @@ _package() {
               'linux-libre-firmware: firmware images needed for some devices')
   provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
   provides+=("${_replacesarchkernel[@]/%/=${pkgver//pck/zen}}" "LINUX-ABI_VERSION=${pkgver%.*}")
-  conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
-  replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+  conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+  replaces+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
 
   cd $_srcname
   local kernver="$(<version)"
@@ -141,6 +143,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+  depends=(pahole)
   provides=("${_replacesarchkernel[@]/%/-headers=${pkgver//pck/zen}}")
   conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
   replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
@@ -171,6 +174,18 @@ _package-headers() {
   cp -t "$builddir/arch/$KARCH" -a arch/$KARCH/include
   install -Dt "$builddir/arch/$KARCH/kernel" -m644 arch/$KARCH/kernel/asm-offsets.s
 
+  # from linux-armv7
+  if [ "$CARCH" = "armv7h" ]; then
+    for i in dove omap2; do
+      mkdir -p "$builddir/arch/$KARCH/mach-$i"
+      cp -t "$builddir/arch/$KARCH/mach-$i/" -a arch/$KARCH/mach-$i/include
+    done
+    for i in omap orion versatile; do
+      mkdir -p "$builddir/arch/$KARCH/plat-$i"
+      cp -t "$builddir/arch/$KARCH/plat-$i/" -a arch/$KARCH/plat-$i/include
+    done
+  fi
+
   install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
   install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
 
@@ -182,18 +197,6 @@ _package-headers() {
   install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
   install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
 
-  # from linux-armv7
-  if [ "$CARCH" = "armv7h" ]; then
-    for i in dove exynos omap2; do
-      mkdir -p "$builddir/arch/$KARCH/mach-$i"
-      cp -t "$builddir/arch/$KARCH/mach-$i/" -a arch/$KARCH/mach-$i/include
-    done
-    for i in omap orion samsung versatile; do
-      mkdir -p "$builddir/arch/$KARCH/plat-$i"
-      cp -t "$builddir/arch/$KARCH/plat-$i/" -a arch/$KARCH/plat-$i/include
-    done
-  fi
-
   echo "Installing KConfig files..."
   find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
 
@@ -259,7 +262,7 @@ _package-docs() {
   ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
 }
 
-pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
+pkgname=("$pkgbase" "$pkgbase-headers") # "$pkgbase-docs"
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {
     $(declare -f "_package${_p#$pkgbase}")