diff options
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | config.x86_64 | 34 |
2 files changed, 51 insertions, 20 deletions
@@ -10,7 +10,7 @@ _pkgver=${_majver}.${_minver} _gnumajver=${_majver}-gnu _gnupkgver=${_pkgver}-gnu _hardenedver=a -_srcname=linux-${_pkgver} +_srcname=linux-${_majver} pkgver=${_pkgver}.${_hardenedver} pkgrel=1 url='https://github.com/anthraxx/linux-hardened' @@ -38,7 +38,7 @@ sha256sums=('55ddf20702311cf3e32127135a38cb272313679962e8a798c108b01cadaeca4f' 'SKIP' '9f7177679c8d3f8d699ef0566a51349d828436dba04603bc2223f98c60d2d178' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' - '5057e0adb2531916af7890daf59eb0e3274507893ed3173dc1e011e42be3c154' + 'd035f14f91f802a35d81b917759ab444baf528b683fd1e07464ad2c5ac8b75cc' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' @@ -55,24 +55,33 @@ _kernelname=${pkgbase#linux-libre} prepare() { cd $_srcname + # add upstream patch + msg2 "Applying upstream patch" + patch -Np1 < ../patch-${_gnumajver}-${_gnupkgver} + + # Hotfixes + msg2 "Applying hotfixes" + patch -p1 -i ../increase-timeout-in-lspcon_wait_mode.patch + + # linux hardened patch + msg2 "Applying hardened patch" + patch -Np1 < ../linux-hardened-${pkgver}.patch + + # graysky2 gcc patch + msg2 "Applying graysky2 cpu patch" + patch -p1 -i ../enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch + + # Ignore ath9k eeprom patch + msg2 "Applying ath9k patch" + patch -p1 -i ../ath9k-regdom-hack.patch + + msg2 "Setting version..." sed -e "/^EXTRAVERSION =/s/=.*/= .${_hardenedver}/" -i Makefile scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "$_kernelname" > localversion.20-pkgname - # add upstream patch - msg2 "Applying upstream patch" - patch -p1 -i "${srcdir}/patch-${_gnumajver}-${_gnupkgver}" - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - msg2 "Applying patch $src..." - patch -Np1 < "../$src" - done msg2 "Setting config..." cp ../config.x86_64 .config diff --git a/config.x86_64 b/config.x86_64 index 56533fc..bdad967 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -504,10 +504,32 @@ CONFIG_PARAVIRT_CLOCK=y CONFIG_JAILHOUSE_GUEST=y CONFIG_NO_BOOTMEM=y # CONFIG_MK8 is not set +# CONFIG_MK8SSE3 is not set +# CONFIG_MK10 is not set +# CONFIG_MBARCELONA is not set +# CONFIG_MBOBCAT is not set +# CONFIG_MJAGUAR is not set +# CONFIG_MBULLDOZER is not set +# CONFIG_MPILEDRIVER is not set +# CONFIG_MSTEAMROLLER is not set +# CONFIG_MEXCAVATOR is not set +# CONFIG_MZEN is not set # CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set # CONFIG_MATOM is not set +# CONFIG_MCORE2 is not set +# CONFIG_MNEHALEM is not set +# CONFIG_MWESTMERE is not set +# CONFIG_MSILVERMONT is not set +# CONFIG_MSANDYBRIDGE is not set +# CONFIG_MIVYBRIDGE is not set +# CONFIG_MHASWELL is not set +# CONFIG_MBROADWELL is not set +# CONFIG_MSKYLAKE is not set +# CONFIG_MSKYLAKEX is not set +# CONFIG_MCANNONLAKE is not set +# CONFIG_MICELAKE is not set CONFIG_GENERIC_CPU=y +# CONFIG_MNATIVE is not set CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_TSC=y @@ -672,9 +694,9 @@ CONFIG_EFI_MIXED=y CONFIG_SECCOMP=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set -CONFIG_HZ_300=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=300 +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set # CONFIG_KEXEC_FILE is not set @@ -9394,7 +9416,7 @@ CONFIG_CRYPTO_SHA512_MB=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA3=m -CONFIG_CRYPTO_SM3=m +# CONFIG_CRYPTO_SM3 is not set CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m @@ -9432,7 +9454,7 @@ CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m -CONFIG_CRYPTO_SM4=m +# CONFIG_CRYPTO_SM4 is not set # CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m |