updpkg: kernels/linux-libre-xtreme 5.3.15-1

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

1 files changed, 25 insertions, 40 deletions

diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD
index 3f1de40b7..6637b5851 100644
--- a/kernels/linux-libre-xtreme/PKGBUILD
+++ b/kernels/linux-libre-xtreme/PKGBUILD
@@ -9,24 +9,24 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre-xtreme
-pkgver=5.3.13_gnu
+pkgver=5.3.15
 _hrdedrel=a
 pkgrel=1
-pkgdesc='Security-Hardened Linux-libre (w/Apparmor by default)'
+pkgdesc='Security-Hardened Linux-libre (with Apparmor by default)'
 rcnver=5.3.10
 rcnrel=armv7-x15
 url='https://wiki.parabola.nu/Xtreme'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
 makedepends=(
-  xmlto kmod inetutils bc libelf
-  python-sphinx python-sphinx_rtd_theme graphviz imagemagick
+  bc kmod libelf
+  xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
 )
 options=('!strip')
 _srcname=linux-5.3
 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://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
   config.i686 config.x86_64 config.armv7h    # the main kernel config files
   linux-armv7h.preset                        # armv7h preset file for mkinitcpio ramdisk
@@ -38,20 +38,13 @@ source=(
   # https://labs.parabola.nu/issues/877
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
   0002-fix-Atmel-maXTouch-touchscreen-support.patch
-
-  # Arch's custom linux patches
+  # extracted patches from Arch Linux kernel sources
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-o.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.
+  # RCN patch (CM3 firmware deblobbed and bloatware removed)
   "https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$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
@@ -63,7 +56,7 @@ source_armv7h=(
   0008-ARM-dove-enable-ethernet-on-D3Plug.patch
   0009-USB-Armory-MkII-support.patch
 )
-source_x86_64=("https://github.com/anthraxx/linux-hardened/releases/download/${pkgver%_*}.$_hrdedrel/linux-hardened-${pkgver%_*}.$_hrdedrel.patch"{,.sig})
+source_x86_64=("https://github.com/anthraxx/linux-hardened/releases/download/$pkgver.$_hrdedrel/linux-hardened-$pkgver.$_hrdedrel.patch"{,.sig})
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
@@ -72,7 +65,7 @@ validpgpkeys=(
 )
 sha512sums=('85d83c973ef96ab414354414da70ab3e1c3df19c3088458498cec1594952878b7967a8988bd9e36d4e728cc573a36e6eac056dbcab2f9aa742f18cbb4fb3164f'
             'SKIP'
-            '3e9c95825f6852a0721a940c80b01b9772c17ae1680c1ce5a151e4f5b577a4a50f030aa0f2fbbc2b53b898b081bf33e67bfdeb513fe5535f95c4b479452264c3'
+            '53ad8cc46fcc54d4504a8711e8bce06d862e285499435a31afe9097cf907948688aa409e0918dac443988d72b6a8dae2fd4d87d1b6ce87a0a3f6f64e589fcd36'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -88,7 +81,7 @@ sha512sums=('85d83c973ef96ab414354414da70ab3e1c3df19c3088458498cec1594952878b796
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
             '5c48b0092ab6a31453e27e6345347fd2d066e1c306c4c8a9144260bf37d0d13879b5cfe688906a06627d39a40a37e229e5300a479b2c9159e93e05ea7adc6b0a'
             'b07d84cac1c784f5652a4681efd54ef89ce9cb0778bd2a633709b7150f9fb59db978dc290b92bcb69b8d211471c22a0be2a81a129318cd7efff601a3c591483c')
-sha512sums_x86_64=('4df1d7be2823df714f9a1f5480ff2d5476929c58910fc4a6b1af3e4d325a4519072850dc0dc218ec402b17aa7456bc1596f95409f2f92717dc7cac07cb42b0b6'
+sha512sums_x86_64=('78604abfd436c2b46ca23048bbfbcbf4e788bcf0001c88a92a0967c48c612c7a367996ace05b5e9741dba091a8b22a663ce5092296ed6687019150b93e2cd8be'
                    'SKIP')
 sha512sums_armv7h=('ffb94962db829fb1f86e3da3558f469dd51d12bb352f17a82daa67a03497b52409b2f53e52eb36569e7be8b3fa7460c3b3ce3ebe3589e8a202c45cbbde0d3162'
                    'SKIP'
@@ -118,9 +111,9 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
 prepare() {
   cd $_srcname
 
-  if [ "${_srcname##*-}" != "${pkgver%_*}" ]; then
+  if [ "${_srcname##*-}" != "$pkgver" ]; then
     msg2 "Applying upstream patch..."
-    patch -p1 -i ../patch-${_srcname##*-}-gnu-${pkgver%_*}-gnu
+    patch -Np1 -i ../patch-${_srcname##*-}-gnu-$pkgver-gnu
   fi
 
   msg2 "Adding freedo as boot logo..."
@@ -141,7 +134,9 @@ prepare() {
       msg2 "Applying patch $src_armv7h..."
       patch -Np1 < "../$src_armv7h"
     done
-  elif [ "$CARCH" = "x86_64" ]; then
+  fi
+
+  if [ "$CARCH" = "x86_64" ]; then
     local src_x86_64
     for src_x86_64 in "${source_x86_64[@]}"; do
       src_x86_64="${src_x86_64%%::*}"
@@ -150,9 +145,7 @@ prepare() {
       msg2 "Applying patch $src_x86_64..."
       patch -Np1 < "../$src_x86_64"
     done
-  fi
-
-  if ! [ "$CARCH" = "x86_64" ]; then
+   else
     local src
     for src in "${source[@]}"; do
       src="${src%%::*}"
@@ -188,7 +181,7 @@ _package() {
               'apparmor: to configure and enable mandatory access control for programs'
               'tomoyo-tools: to manage tomoyo userspace tools')
   optdepends_x86_64=('usbctl: deny_new_usb control')
-  provides=("${_replacesarchkernel[@]/%/=${pkgver%%_*}}" "LINUX-ABI_VERSION=${pkgver%%_*}")
+  provides=("${_replacesarchkernel[@]/%/=$pkgver}" "LINUX-ABI_VERSION=$pkgver")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
 
@@ -227,8 +220,8 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for $pkgdesc kernel"
-  provides=("${_replacesarchkernel[@]/%/-headers=${pkgver%%_*}}")
+  pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+  provides=("${_replacesarchkernel[@]/%/-headers=$pkgver}")
   conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
   replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
 
@@ -329,8 +322,8 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hacker's manual for the $pkgdesc kernel"
-  provides=("${_replacesarchkernel[@]/%/-docs=${pkgver%%_*}}")
+  pkgdesc="Documentation for the $pkgdesc kernel"
+  provides=("${_replacesarchkernel[@]/%/-docs=$pkgver}")
   conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
   replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
 
@@ -338,20 +331,12 @@ _package-docs() {
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
 
   msg2 "Installing documentation..."
-  mkdir -p "$builddir"
-  cp -t "$builddir" -a Documentation
-
-  msg2 "Removing unneeded files..."
-  rm -rv "$builddir"/Documentation/{,output/}.[^.]*
-
-  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)
+    dst="${src#Documentation/}"
+    dst="$builddir/Documentation/${dst#output/}"
+    install -Dm644 "$src" "$dst"
+  done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
 
   msg2 "Adding symlink..."
   mkdir -p "$pkgdir/usr/share/doc"