From 11627b795e6309bc562f07f64b817a974c22d992 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 2 Dec 2018 19:39:36 -0800 Subject: Added workaround for broken CONFIG_LOCALVERSION | Added libre to kernel name --- PKGBUILD | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 92c488d..665bf5a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -91,7 +91,7 @@ prepare() { sed -e "/^EXTRAVERSION =/s/=.*/= .${_hardenedver}/" -i Makefile scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel - echo "$_kernelname" > localversion.20-pkgname + echo "-libre$_kernelname" > localversion.20-pkgname msg2 "Setting config..." @@ -102,14 +102,26 @@ prepare() { cp ../config.x86_64 .config #fi make olddefconfig - + make menuconfig make -s kernelrelease > ../version - msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" + + # workaround for make -s kernelrelease not applying + # localversion to version when changed using menuconfig + grep -Po '(?<=CONFIG_LOCALVERSION=").*(?=")' .config > ../localversion + echo "$_pkgver" > ../version.temp + echo ".$_hardenedver" >> ../version.temp + cat "localversion.10-pkgrel" >> ../version.temp + cat "localversion.20-pkgname" >> ../version.temp + cat ../localversion >> ../version.temp + cat ../version.temp | tr -d "\n" > ../version # back up the config + #msg2 "Backing up config..." #cp .config ${SRCDEST}/config.libre-hardened.previous + + msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" } build() { -- cgit v1.2.1