From a326b62c7647b36ce40774055e5aa56938262403 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Thu, 28 Feb 2019 22:03:41 -0300
Subject: upgpkg: libre/linux-libre-hardened 4.20.12.a_gnu-1

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

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

diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index 141570050..ba624b585 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=linux-libre-hardened
 _srcbasever=4.20-gnu
-_srcver=4.20.11-gnu
+_srcver=4.20.12-gnu
 _hardenedver=a
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -20,7 +20,7 @@ _archpkgver=${_srcver%-*}
 pkgver=${_srcver//-/.${_hardenedver}_}
 pkgrel=1
 arch=(x86_64)
-url="https://linux-libre.fsfla.org/"
+url='https://linux-libre.fsfla.org/'
 license=(GPL2)
 makedepends=(xmlto kmod inetutils bc libelf python-sphinx graphviz)
 options=('!strip')
@@ -32,14 +32,14 @@ source=(
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
   # the main kernel config files
-  'config.x86_64'
+  config.x86_64
   # pacman hooks for depmod and initramfs regeneration
-  '60-linux.hook' '90-linux.hook'
+  60-linux.hook 90-linux.hook
   # standard config files for mkinitcpio ramdisk
-  'linux.preset'
+  linux.preset
   # other patches
-  '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
-  '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
+  0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+  0002-fix-Atmel-maXTouch-touchscreen-support.patch
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -49,9 +49,9 @@ validpgpkeys=(
 )
 sha512sums=('a4a0a25fd490c051deb32ff84ba51e8807bfc8db1ad46c22c7807e9be2e5db5e1c22c211e47fca2509d5d75d64626fb28e9bbc8ccadc565f27fe9c8e47e12dc4'
             'SKIP'
-            '3cb387665734be799f3c833939f0938e17216f08aff5113a85a845dcf382d997f3574e8ea30c0fb6d5e85295106a347324c3b50858939d4568b6fa25c40a05ff'
+            'f29855be66305a0f07673a903529cef79e4d915f2db11541ba2a6f64e2f6fd875baf3a7bc81061f491c97d3895dca8d2df099179295bb6499f1b0d950031ab55'
             'SKIP'
-            'e5ab903ce5a03fab783dc35bdffc35fc70201c3f2a05c0fc33f502adff85d8116a94b2461d83cc5c39e824cdc6cd293f2a1a94ec2b9efb2d56fe6aaafd2f572f'
+            '6e067d31e48efb5b6e5de5d2da88a2744d413f7825652ea137dce844db44b755527645c5ba76ce0e5b9d3261abdcad9229d0f8a285e569cf03d84a10ca2fa0ec'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -127,22 +127,19 @@ _package() {
   install=linux.install
 
   local kernver="$(<version)"
+  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
 
   cd $_srcname
 
   msg2 "Installing boot image..."
-  local image="$pkgdir/boot/vmlinuz-$pkgbase"
-  install -Dm644 "$(make -s image_name)" "$image"
+  # 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"
+  install -Dm644 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase"
 
   msg2 "Installing modules..."
-  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
-  mkdir -p "$modulesdir"
   make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
 
-  # systemd expects to find the kernel here to allow hibernation
-  # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-  ln -sr "$image" "$modulesdir/vmlinuz"
-
   # a place for external modules,
   # with version file for building modules and running depmod from hook
   local extramodules="extramodules$_kernelname"
-- 
cgit v1.2.3