From 84cc2ea0b61798fbdb8fed3211c8731df9a7deba Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 28 Aug 2018 10:23:58 -0700 Subject: Updated to 4.18.5.a --- PKGBUILD | 306 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 150 insertions(+), 156 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 47a8023..fa3f11b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,17 +1,18 @@ -# Maintainer: Levente Polyak -# Contributor: Daniel Micay -# Contributor: Tobias Powalowski -# Contributor: Thomas Baechler +# Maintainer: jc_gargma +# Maintainer (Arch): Levente Polyak +# Contributor (Arch): Daniel Micay +# Contributor (Arch): Tobias Powalowski +# Contributor (Arch): Thomas Baechler pkgbase=linux-hardened-ck -_majver=4.17 -_minver=11 +_majver=4.18 +_minver=5 _pkgver=${_majver}.${_minver} _hardenedver=a _NUMAdisable=y _ckpatchversion=1 _ckpatchname="patch-${_majver}-ck${_ckpatchversion}" -_jcpatchversion="jcmod1" +_jcpatchversion=1 _gcc_more_v='20180509' _srcname=linux-${_pkgver} pkgver=${_pkgver}.${_hardenedver} @@ -25,8 +26,12 @@ makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf') options=('!strip') source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.sign +#source=(https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz +# https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign +# https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.xz +# https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.sign https://github.com/anthraxx/linux-hardened/releases/download/${_pkgver}.${_hardenedver}/linux-hardened-${_pkgver}.${_hardenedver}.patch{,.sig} - patch-${_majver}-ck${_ckpatchversion}-${_jcpatchversion}.patch + patch-${_majver}-ck${_ckpatchversion}-jcmod${_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 ath9k-regdom-hack.patch @@ -35,78 +40,67 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.xz 90-linux.hook # pacman hook for initramfs regeneration linux.preset # standard config files for mkinitcpio ramdisk - # https://bugs.archlinux.org/task/56780 - ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch - # https://bugs.archlinux.org/task/56711 - 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 + increase-timeout-in-lspcon_wait_mode.patch ) -sha256sums=('db1e84ed4f213b43d50f3373627b2ffcdb3b65f3430f746a38f801554ef3728c' +sha256sums=('fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd' 'SKIP' - '586f3a84cf79cee5a7839941b6b434be519515c317abc8e6d491174652ac93cb' + 'a06238ea0ce66d090fa899d6951c9d40fa993c7b4975088dded2c1e660c1ff69' 'SKIP' - '27b96297102a9ccf690c1bdc5f21bc10308f6de90396385dce7341fb8e5a2116' + 'ea34f144abf9d714e268626e3a9332dc302a4754cbf092b5486dbf3c07fe57a0' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' - '97a9bfa8a97aef31fac71b45ad9d3ce362167e6dc6b2966b5725ff43d1dd29c3' + '830db84d2fcb113a1bba8519fb0855f241d771ea10e4b4d0707cdc1583697420' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - 'd744e7f4552896670bc8b99361534eec7ba095bebc2462ef0e5ee433e6341a0a' - '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e' - 'ef7c149d9af24efea551cec86e26f52c9c1cc02714335e948f929985ff414676' - '25a0c0de5bae21f30557ed32815759be147a6a33020dc289e913d3147d3244f3') + '0fa6899b57d32988b70050f1a67f435936273ce1aa98575271d564ccfaf45f77') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay 'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak ) + _kernelname=${pkgbase#linux} : ${_kernelname:=-hardened} prepare() { - cd ${_srcname} + cd $_srcname + +# # add upstream patch +# msg2 "Applying upstream patch" +# patch -Np1 < ../patch-${_gnumajver}-${_gnupkgver} # 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}" + patch -p1 -i ../increase-timeout-in-lspcon_wait_mode.patch # linux hardened patch msg2 "Applying hardened patch" - patch -p1 -i "${srcdir}/linux-hardened-${pkgver}.patch" + patch -Np1 < ../linux-hardened-${pkgver}.patch - # Patch source with ck patchset - msg2 "Applying ck patch" - #patch -p1 -i "${srcdir}/${_ckpatchname}" - patch -p1 -i "${srcdir}/${_ckpatchname}-${_jcpatchversion}.patch" - - # Patch source to unlock additional gcc CPU optimizatons - # https://github.com/graysky2/kernel_gcc_patch - msg2 "Applying graysky2 patch" - patch -p1 -i "${srcdir}/kernel_gcc_patch-$_gcc_more_v/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch" + # graysky2 gcc patch + msg2 "Applying graysky2 cpu patch" + patch -p1 -i ../kernel_gcc_patch-${_gcc_more_v}/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch # Ignore ath9k eeprom patch - patch -p1 -i "${srcdir}/ath9k-regdom-hack.patch" + msg2 "Applying ath9k patch" + patch -p1 -i ../ath9k-regdom-hack.patch + + # ck patch + msg2 "Applying ck patch" + patch -p1 -i ../patch-${_majver}-ck${_ckpatchversion}-jcmod${_jcpatchversion}.patch - cat ../config.x86_64 - >.config < localversion.10-pkgrel + echo "$_kernelname" > localversion.20-pkgname - # set extraversion to pkgrel and empty localversion - sed -e "/^EXTRAVERSION =/s/=.*/= .${_hardenedver}-${pkgrel}/" \ - -e "/^EXTRAVERSION =/aLOCALVERSION =" \ - -i Makefile + + msg2 "Setting config..." + cp ../config.x86_64 .config ### Optionally disable NUMA for 64-bit kernels only # (x86 kernels do not support NUMA) @@ -127,157 +121,157 @@ END make olddefconfig make menuconfig + + make -s kernelrelease > ../version + msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" } build() { - cd ${_srcname} + cd $_srcname make bzImage modules } _package() { pkgdesc="The ${pkgbase/linux/Linux} kernel and modules" - [ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + [[ $pkgbase = linux ]] && groups=(base) + depends=(coreutils linux-firmware kmod mkinitcpio) optdepends=('crda: to set the correct wireless channels of your country' 'usbctl: deny_new_usb control') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") + backup=("etc/mkinitcpio.d/$pkgbase.preset") install=linux.install - cd ${_srcname} + local kernver="$( "${startdir}/${install}.pkg" - true && install=${install}.pkg - - # install mkinitcpio preset file - sed "${_subst}" ../linux.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - sed "${_subst}" ../60-linux.hook | - install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgbase}.hook" - sed "${_subst}" ../90-linux.hook | - install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook" + sed "$subst" "$startdir/$install" > "$startdir/$install.pkg" + true && install=$install.pkg + + # fill in mkinitcpio preset and pacman hooks + sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \ + "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" + sed "$subst" ../60-linux.hook | install -Dm644 /dev/stdin \ + "$pkgdir/usr/share/libalpm/hooks/60-$pkgbase.hook" + sed "$subst" ../90-linux.hook | install -Dm644 /dev/stdin \ + "$pkgdir/usr/share/libalpm/hooks/90-$pkgbase.hook" + + msg2 "Fixing permissions..." + chmod -Rc u=rwX,go=rX "$pkgdir" } _package-headers() { pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" - cd ${_srcname} - local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build" + local builddir="$pkgdir/usr/lib/modules/$(/dev/null) -} - -_package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel" - - cd ${_srcname} - local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build" + done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0) + msg2 "Adding symlink..." + mkdir -p "$pkgdir/usr/src" + ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver" - mkdir -p "${_builddir}" - cp -t "${_builddir}" -a Documentation - # Fix permissions - chmod -R u=rwX,go=rX "${_builddir}" + msg2 "Fixing permissions..." + chmod -Rc u=rwX,go=rX "$pkgdir" } -pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") -for _p in ${pkgname[@]}; do - eval "package_${_p}() { - $(declare -f "_package${_p#${pkgbase}}") - _package${_p#${pkgbase}} +pkgname=("$pkgbase" "$pkgbase-headers") +for _p in "${pkgname[@]}"; do + eval "package_$_p() { + $(declare -f "_package${_p#$pkgbase}") + _package${_p#$pkgbase} }" done -- cgit v1.2.1