From 63001768ed124ce28b4c8057ebeda97c39916c22 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Fri, 27 Mar 2020 14:21:41 -0400
Subject: updpkg: libre/linux-libre-pck 5.5.13.pck1-1

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

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

diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD
index f842b9b07..d7efacbfd 100644
--- a/libre/linux-libre-pck/PKGBUILD
+++ b/libre/linux-libre-pck/PKGBUILD
@@ -14,7 +14,7 @@ _replacesoldkernels=()
 _replacesoldmodules=()
 
 pkgbase=linux-libre-pck
-pkgver=5.5.2.pck2
+pkgver=5.5.13.pck1
 pkgrel=1
 pkgdesc='Linux-libre PCK'
 url='https://wiki.parabola.nu/PCK'
@@ -39,14 +39,14 @@ validpgpkeys=(
 )
 sha512sums=('187368a8fb4e04acfd7d18a024d6cdbc2841bcc06dcfbc3a053706e8512c3e3f573755228347c11bd791b296ec60eb2d67d5075ece2aef234a847e72f2b3e746'
             'SKIP'
-            'f4c6e0bc192dbb5b38db407443ab4dd7c352b7ed2e638abcfab90a80486625a962fd30d0aa1d98ec87a87ab2c0de71a2d9ab4246fcc5fa7685803b02b52ed23f'
+            '2c882f6256bb9409b59fde28183e71701e969aab8a0e36821550a639a5c5de3e3b129a708f0f9c83135653cfccc837601850b631fb6d63449e2083319aba1d30'
             'SKIP'
-            '00264b0bbfbb44c71b7a64ad703c2809bfa9230b832d39ce5051a9686104662bfe37c17529db0a1225efadac6ce7e1ae93ae36d82e572c16f2579a2dec747900'
+            '3c5e270f7c33ce3637f8a984d92139c74d8fc01dcbbef38822a1a4518f6c08f2a37ca889cd9c99c7104222178af96693cd558d7daeb57ea56f38ac37130f7168'
             'SKIP'
-            'c17fd9d57850f9d4f04d5c04d165c83419c6e0e31bdd5deed13f6af59c7000f72936391df996d4e560423675d3abe207604a31f7bf490897d396fadfdb9a77f8'
-            '7c5dd8d9d5b067783504a3272265bd799cb8afb1f35eba6dce67ceca24597b3e29a9d91595f1eac9ae0e961835b08af3c7147f13525091b04d47765e72d2e227'
+            'b1f86753fb1a6f789d35c69420192e2455c2fa7caf4e65d2e2d9a0524fa4c17ec6f8562d86ea2068ba96c2571c0998ce2fe75f9818e3cd4c8256825169b00a69'
+            'af70a9c52394414687cf11efa7c12fc0c92fb08dbd4f0cd8ecfa35abe5ba45d293fa249bbe2b1572acc9294af08fba28072fb8e316e7a8b602be4ded194b747a'
             'eb25dc6db24960fbf946aa05da0ba8aa5ef27daf0064a5ec835e5c811080b23cbe4e0eb5eeef0a7a10ddb0d39493826645575e098a14cd9fa77b9e9522af2b8f'
-            'f01e7925b262d2874a8a991b1f27d057356a2a384d2012b61be5a631d4e4d7cf87461c8fb9e7f183831f5a829ad204897f1f0545a52df6288a0e04a5c2e31b96')
+            'aca591b5a2e838754e3c5fd2c0e50098ad54c2d0f990de5bf9cff8608e881daf0e37132294ed1a0e0a7b9e1c194c0b89f95da001d94febdb25a01c409060e3ac')
 
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
 _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}")
@@ -88,16 +88,13 @@ prepare() {
   make olddefconfig
 
   make -s kernelrelease > version
-  echo "Prepared %s version %s" "$pkgbase" "$(<version)"
+  echo "Prepared $pkgbase version $(<version)"
 }
 
 build() {
   cd $_srcname
-  if [ "$CARCH" = "armv7h" ]; then
-    make zImage modules htmldocs dtbs
-  else
-    make bzImage modules htmldocs
-  fi
+  make all
+  make htmldocs
 }
 
 _package() {
@@ -114,9 +111,6 @@ _package() {
   local modulesdir="$pkgdir/usr/lib/modules/$kernver"
 
   echo "Installing boot image..."
-  if [ "$CARCH" = "armv7h" ]; then
-    make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install
-  fi
   # systemd expects to find the kernel here to allow hibernation
   # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
   install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
@@ -130,10 +124,12 @@ _package() {
   # remove build and source links
   rm "$modulesdir"/{source,build}
 
-  # armv7h presets only work with ALL_kver=$kernver
   if [ "$CARCH" = "armv7h" ]; then
-    backup=("etc/mkinitcpio.d/$pkgbase.preset")
+    echo "Installing device tree binaries..."
+    make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install
 
+    # armv7h presets only work with ALL_kver=$kernver
+    backup=("etc/mkinitcpio.d/$pkgbase.preset")
     echo "Installing mkinitcpio preset..."
     sed "s|%PKGBASE%|$pkgbase|g;s|%KERNVER%|$kernver|g" ../linux-armv7h.preset \
       | install -Dm644 /dev/stdin "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
-- 
cgit v1.2.3