From e22be3556471dc89aa320b66e299174ab13f5ed7 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 12 May 2019 13:32:09 -0700 Subject: Updated to 5.0.15.a --- PKGBUILD | 30 ++++++++++++++++-------------- config.x86_64 | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index dc88608..2ea1ad3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,11 +17,11 @@ pkgbase=linux-libre-hardened-ck _majver=5.0 -_minver=12 +_minver=15 if [ "$_minver" == "0" ]; then - pkgver=${_majver} + _pkgver=${_majver} else - pkgver=${_majver}.${_minver} + _pkgver=${_majver}.${_minver} fi _gnumajver=${_majver}-gnu _gnupkgver=${_pkgver}-gnu @@ -57,9 +57,9 @@ source=( ) sha256sums=('7df5025d1960520bfea158054130467770eca379999d5ac48175ed5ee804faa1' 'SKIP' - 'cbecd2d3acf5997db3a7d416e673fcf5d6e797f5d141822814b2e7c527e37ca2' + '24a5016e0f32f5fb56ffd1c98e47ad59a5865528cc24c5dee18719503dce1e7f' 'SKIP' - '710ea9f7aab089ac15012ecd09254241301ae336ebd41778cd7f7ad86e787b6f' + '8acf8916212da97f997c539e48b11d6a4126a2828e57010467a45fc44ce50e3d' 'SKIP' '2a551169f8cbb424900372fe698ae9003fbcad3614a46ca3f56b103f9c1ea763' 'b6defd1ef672b73631ecfa79fc204d6219175f333b53d86af668c1e1a9b6288e' @@ -68,7 +68,7 @@ sha256sums=('7df5025d1960520bfea158054130467770eca379999d5ac48175ed5ee804faa1' 'd35338c92d0dbf27ffedaf100bd852dd13fd9b5d49b12a10b91194a2ae654447' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb' - '4e9a8b97837a16be027b13a2059ac14e33cf6959b91dc3fa7ca95df7c1df7e0d' + 'e9d886243137c7009c8d8fbd008da399274b35de8e27fdcd7ee3b4cd2b01ccc0' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') @@ -84,8 +84,10 @@ prepare() { cd $_srcname # add upstream patch - msg2 "Applying upstream patch" - patch -Np1 < ../patch-${_gnumajver}-${_gnupkgver} + if [ "$_minver" != "0" ]; then + msg2 "Applying upstream patch" + patch -Np1 < ../patch-${_gnumajver}-${_gnupkgver} + fi # Hotfixes # msg2 "Applying hotfixes" @@ -130,11 +132,11 @@ prepare() { msg2 "Setting config..." # we are in src/linux-x.yy.zz, looking for a config next to the pkgbuild - #if [ -f ${SRCDEST}/config.libre-hardened-ck.previous ]; then - # cp ${SRCDEST}/config.libre-hardened-ck.previous .config - #else +# if [ -f ${SRCDEST}/config.libre-hardened-ck.previous ]; then +# cp ${SRCDEST}/config.libre-hardened-ck.previous .config +# else cp ../config.x86_64 .config - #fi +# fi make olddefconfig @@ -158,8 +160,8 @@ prepare() { cat ../version.temp | tr -d "\n" > ../version # back up the config - #msg2 "Backing up config..." - #cp .config ${SRCDEST}/config.libre-hardened-ck.previous +# msg2 "Backing up config..." +# cp .config ${SRCDEST}/config.libre-hardened-ck.previous msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" } diff --git a/config.x86_64 b/config.x86_64 index 6e20a44..ba8206a 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.0.10 Kernel Configuration +# Linux/x86 5.0.15 Kernel Configuration # # -- cgit v1.2.1