From d1583cd59c4926a6b39920d287b74ea9434dd051 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 24 Aug 2017 13:19:43 -0700
Subject: Merged in upstream | i686 is back

---
 PKGBUILD | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 3025208..9cacc2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 # Based on linux-grsec package
 
-pkgbase=linux-libre-unofficial_grsec
+pkgbase=linux-libre-unofficial-grsec
 _majv=4.9
 _minv=.44
 _timestamp=20170817112724
@@ -18,7 +18,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}.r${_timestamp}
 pkgver=${_pkgver//-/_}.r${_timestamp}
 pkgrel=1
-arch=('x86_64')
+arch=('i686' 'x86_64')
 url="https://github.com/minipli/linux-unofficial_grsec"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf')
@@ -30,7 +30,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         "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.i686' 'config.x86_64'
         # pacman hook for initramfs regeneration
         '99-linux.hook'
         # standard config files for mkinitcpio ramdisk
@@ -51,7 +51,8 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '27c350d7d159c00533f158df669a31959f6c3b43c26a1a45e7eec790c6836391a025856ea016891fc91bf96f9ec0cfd687fa05842b87f2bc57d833dd8a5d1de7'
+            '1d8ba1fa18a6e8f1cd80bd16bd0a17e497983ad46c057d78b7b5fa9df12fca3b3134fbaa6e9f00f57b9f9b2295550da426d65dab8babc896c6ba63879422c58c'
+            '602660d3fde633895c8603a39ce1cc88ea9d91eb992962caf7fa09180778e897a1042f680b3a0151ec59ab647467f846a2c607ea94a6a8b852b66b81b5e5d330'
             'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             '1a43bc2cded9d8831f1ef833a7e76a2d9ab4f835129d9408a1bbef2448cdf3f8c6741dffc0a6268a543fea390943cd59cd06444922fc9b33420e74ee2fc2e899'
@@ -81,8 +82,9 @@ prepare() {
     patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
   fi
 
-  # add grsecurity patches (bnx2 firmware deblobbed)
+  # add unofficial_grsec patches (bnx2 firmware deblobbed)
   patch -Np1 -i "${srcdir}/v${_fullv}-unofficial_grsec-libre-${_timestamp}.diff"
+  rm localversion-unofficial_grsec
 
   # add freedo as boot logo
   install -m644 -t drivers/video/logo \
@@ -135,8 +137,8 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase^} kernel and modules with grsecurity/PaX patches"
-  [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc')
+  pkgdesc="The ${pkgbase^} kernel and modules with unofficial grsecurity/PaX patches"
+  [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7' 'grsec-common')
   optdepends=('crda: to set the correct wireless channels of your country'
               'gradm: to configure and enable Role Based Access Control (RBAC)'
@@ -231,6 +233,10 @@ _package-headers() {
 
   cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
 
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
+  fi
+
   cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
 
   # add docbook makefile
@@ -343,5 +349,3 @@ for _p in ${pkgname[@]}; do
     _package${_p#${pkgbase}}
   }"
 done
-
-# vim:set ts=8 sts=2 sw=2 et:
-- 
cgit v1.2.1