From ae45bea2f926fbf4e58337f449415ab1bae0e682 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 17 Oct 2019 22:34:50 -0700
Subject: Updated to 5.3.7

---
 PKGBUILD | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 033cf8b..730e3cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@
 
 pkgbase=linux
 _majver=5.3
-_minver=5
+_minver=7
   if [ "$_minver" == "0" ]; then
     pkgver=${_majver}
   else
@@ -34,6 +34,7 @@ options=('!strip')
 source=(
         https://www.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar.{xz,sign}
         0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch
+        0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch
         graysky_bdver2-hotfix.patch
         kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
         ath9k-regdom-hack.patch
@@ -43,15 +44,16 @@ source=(
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
        )
-sha256sums=('80ed8c5cfc298fdbccbd69f8b919c12b11d8b54d8c20f08fc8c3b1840d1e53f0'
+sha256sums=('c6c9714e21531c825c306b107bc6f6c7bfa2d5270a14bad170f8de5a73d34802'
             'SKIP'
             'e862ecd2cb0b20e1859ec3e47616457a9a3acb111cd5a86094f9ed1dbd7f42ac'
+            '9b92add42581aeb427a0c2cffc584815f0e4223a1a6bc27802ccd77eaf6e4bec'
             'c5405139aa0a90a6f68f6a13e066a2bd0600c970f9f525cd3aa114b044a7f73b'
             '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
             '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
             '583a76bcfdebda1f1edb13d7eb7fea3ad72e86569d6572e15a98398253a7008f'
-            'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
+            '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 validpgpkeys=(
@@ -74,6 +76,7 @@ prepare() {
   # Hotfixes
   msg2 "Applying hotfixes"
   patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch
+  patch -p1 -i ../0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch
 
 
   # graysky gcc hotfixes
@@ -117,7 +120,7 @@ prepare() {
     sed -i '/SUBLEVEL = 0/d' Makefile
   fi
 
-  make -s kernelrelease > ../version
+  make -s kernelrelease > version
 
   # workaround for make -s kernelrelease not applying
   # localversion to version when changed using menuconfig
@@ -126,13 +129,13 @@ prepare() {
   cat "localversion.10-pkgrel" >> ../version.temp
   cat "localversion.20-pkgname" >> ../version.temp
   cat ../localversion >> ../version.temp
-  cat ../version.temp | tr -d "\n" > ../version
+  cat ../version.temp | tr -d "\n" > version
 
   # back up the config
 #  msg2 "Backing up config..."
 #  cp .config ${SRCDEST}/config.previous
 
-  msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
+  msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
 }
 
 build() {
@@ -148,11 +151,11 @@ _package() {
   backup=("etc/mkinitcpio.d/$pkgbase.preset")
   install=linux.install
 
+  cd $_srcname
+
   local kernver="$(<version)"
   local modulesdir="$pkgdir/usr/lib/modules/$kernver"
 
-  cd $_srcname
-
   msg2 "Installing boot image..."
   install -Dm644 "$(make -s image_name)" "$pkgdir/boot/vmlinuz-$pkgbase"
 
@@ -163,13 +166,6 @@ _package() {
   mkdir -p "$modulesdir"
   make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
 
-  # a place for external modules,
-  # with version file for building modules and running depmod from hook
-  local extramodules="extramodules$_kernelname"
-  local extradir="$pkgdir/usr/lib/modules/$extramodules"
-  install -Dt "$extradir" -m644 ../version
-  ln -sr "$extradir" "$modulesdir/extramodules"
-
   # remove build and source links
   rm "$modulesdir"/{source,build}
 
@@ -178,7 +174,6 @@ _package() {
   local subst="
     s|%PKGBASE%|$pkgbase|g
     s|%KERNVER%|$kernver|g
-    s|%EXTRAMODULES%|$extramodules|g
   "
 
   # hack to allow specifying an initially nonexisting install file
@@ -200,12 +195,12 @@ _package() {
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
 
-  local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
-
   cd $_srcname
 
+  local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+
   msg2 "Installing build files..."
-  install -Dt "$builddir" -m644 Makefile .config Module.symvers System.map vmlinux
+  install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map localversion.* version vmlinux
   install -Dt "$builddir/kernel" -m644 kernel/Makefile
   install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
   cp -t "$builddir" -a scripts
@@ -271,7 +266,7 @@ _package-headers() {
 
   msg2 "Adding symlink..."
   mkdir -p "$pkgdir/usr/src"
-  ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver"
+  ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 
   msg2 "Fixing permissions..."
   chmod -Rc u=rwX,go=rX "$pkgdir"
-- 
cgit v1.2.1