Updated to 4.17.11.a

2 files changed, 22 insertions, 44 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 30bd37e..d520cd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,17 @@
 
 pkgbase=linux-libre-hardened-ck
 _majver=4.17
-_minver=10
-_fullver=${_majver}.${_minver}
-_basever=${_majver}-gnu
-_pkgver=${_fullver}-gnu
-_hardver=a
+_minver=11
+_pkgver=${_majver}.${_minver}
+_gnuver=${_pkgver}-gnu
+_hardenedver=a
 _NUMAdisable=y
 _ckpatchversion=1
 _ckpatchname="patch-${_majver}-ck${_ckpatchversion}"
 _jcpatchversion="jcmod1"
 _gcc_more_v='20180509'
-_srcname=linux-${_majver}
-pkgver=${_fullver}.${_hardver}
+_srcname=linux-${_pkgver}
+pkgver=${_pkgver}.${_hardenedver}
 pkgrel=1
 conflicts=('linux-hardened-ck')
 url='https://github.com/anthraxx/linux-hardened'
@@ -25,9 +24,8 @@ arch=('x86_64')
 license=('GPL2')
 makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
 options=('!strip')
-source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}/linux-libre-${_basever}.tar.xz{,.sign}
-        https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_basever}-${_pkgver}.xz{,.sign}
-        https://github.com/anthraxx/linux-hardened/releases/download/${_fullver}.${_hardver}/linux-hardened-${_fullver}.${_hardver}.patch{,.sig}
+source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnuver}/linux-libre-${_gnuver}.tar.xz{,.sign}
+        https://github.com/anthraxx/linux-hardened/releases/download/${_pkgver}.${_hardenedver}/linux-hardened-${_pkgver}.${_hardenedver}.patch{,.sig}
         patch-${_majver}-ck${_ckpatchversion}-${_jcpatchversion}.patch
         #http://ck.kolivas.org/patches/4.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatchname}.xz
         enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz
@@ -43,43 +41,40 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}/linux
         Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
         # Fix iwd provoking a BUG
         mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
+        ACPICA-AML-Parser-ignore-control-method-status-in-module-level-code.patch
 )
-sha256sums=('eb221b36ac19cba3c11734b09230dc89c2f33054c45501b23cc94e9370c66b29'
+sha256sums=('e8d4f6f3d78373900db1d69153cc285f3a9e64be33c9273ac83f7e9b11f51930'
             'SKIP'
-            '1ed76dbb610d366dd8484620d5b485c9c5e3a559ba7b3421dd7f2e1d29f1342d'
-            'SKIP'
-            '2da7c447a0d4b1969c220488e5eef2c85fa93861ad5909c632c26cbabbb256b3'
+            '586f3a84cf79cee5a7839941b6b434be519515c317abc8e6d491174652ac93cb'
             'SKIP'
             '27b96297102a9ccf690c1bdc5f21bc10308f6de90396385dce7341fb8e5a2116'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
-            '26e2f082c5272e9d428ecadd47b8f86c52d5a89f46687235771f1e5b1efa9fc0'
+            '1034eb2fa71c9a1f97ce820f4ab62b40717f40ebb50c4eee9b8e1e26ef1413ea'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             'd744e7f4552896670bc8b99361534eec7ba095bebc2462ef0e5ee433e6341a0a'
             '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e'
-            'ef7c149d9af24efea551cec86e26f52c9c1cc02714335e948f929985ff414676')
+            'ef7c149d9af24efea551cec86e26f52c9c1cc02714335e948f929985ff414676'
+            '25a0c0de5bae21f30557ed32815759be147a6a33020dc289e913d3147d3244f3')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
               'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
              )
 _kernelname=${pkgbase#linux-libre}
-: ${_kernelname:=-ARCH}
+: ${_kernelname:=-hardened}
 
 prepare() {
   cd ${_srcname}
 
-  # add upstream patch
-  msg2 "Applying upstream patch"
-  patch -p1 -i "${srcdir}/patch-${_basever}-${_pkgver}"
-
   # Hotfixes
   msg2 "Applying hotfixes"
   patch -p1 -i "${srcdir}/ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch"
   patch -p1 -i "${srcdir}/Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch"
   patch -p1 -i "${srcdir}/mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch"
+  patch -p1 -i "${srcdir}/ACPICA-AML-Parser-ignore-control-method-status-in-module-level-code.patch"
   
   # fix naming schema in EXTRAVERSION of ck patch set
   #sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatchname}"
@@ -102,16 +97,13 @@ prepare() {
   patch -p1 -i "${srcdir}/ath9k-regdom-hack.patch"
 
 
-  # add latest fixes from stable queue, if needed
-  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-
   cat ../config.x86_64 - >.config <<END
 CONFIG_LOCALVERSION="${_kernelname}"
 CONFIG_LOCALVERSION_AUTO=n
 END
 
   # set extraversion to pkgrel and empty localversion
-  sed -e "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" \
+  sed -e "/^EXTRAVERSION =/s/=.*/= .${_hardenedver}-${pkgrel}/" \
       -e "/^EXTRAVERSION =/aLOCALVERSION =" \
       -i Makefile
 
@@ -131,27 +123,13 @@ END
       -i -e '/CONFIG_ACPI_NUMA=y/d' ./.config
   fi
 
-  # don't run depmod on 'make install'. We'll do this ourselves in packaging
-  sed -i '2iexit 0' scripts/depmod.sh
-
-  # get kernel version
-  make prepare
-
-  # load configuration
-  # Configure the kernel. Replace the line below with one of your choice.
-  make menuconfig # CLI menu for configuration
-  #make nconfig # new CLI menu for configuration
-  #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
-  # ... or manually edit .config
-
-  # rewrite configuration
-  yes "" | make config >/dev/null
+  make olddefconfig
+  
+  make menuconfig
 }
 
 build() {
   cd ${_srcname}
-
   make bzImage modules
 }
 
@@ -172,7 +150,7 @@ _package() {
   _basekernel=${_basekernel%.*}
 
   mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
-  make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
+  make INSTALL_MOD_PATH="${pkgdir}/usr" DEPMOD=/doesnt/exist modules_install
   cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
   # make room for external modules
diff --git a/config.x86_64 b/config.x86_64
index 44b8e5d..d3b77ef 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.10 Kernel Configuration
+# Linux/x86 4.17.11 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y