summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2019-01-25 00:32:37 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2019-01-25 00:32:37 -0800
commit4cac518c8c27e49127ef1bfb97d4c1a29264a286 (patch)
tree18703fdefc844d9b97aea97e5e79ab5528be5b3e
parentUpdated to 4.20.4.a (diff)
downloadlinux-hardened-ck-4cac518c8c27e49127ef1bfb97d4c1a29264a286.tar.xz
Updated aliases on source | Create vmlinuz as 600 | Add if around objtool | Reposition conflicts
-rw-r--r--PKGBUILD10
1 files changed, 6 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9581984..34cb35d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,12 +26,12 @@ _gcc_more_v='20180509'
_srcname=linux-${_pkgver}
pkgver=${_pkgver}.${_hardenedver}
pkgrel=1
-conflicts=('linux-libre-hardened-ck')
url='https://github.com/anthraxx/linux-hardened'
#url='http://ck.kolivas.org/patches/'
arch=('x86_64')
license=('GPL2')
makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
+conflicts=('linux-libre-hardened-ck')
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
@@ -39,7 +39,7 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.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}
+ https://github.com/anthraxx/linux-hardened/releases/download/${pkgver}/linux-hardened-$_pkgver}.patch{,.sig}
patch-${_majver}-ck${_ckpatchversion}-jcmod${_jcpatchversion}.patch
#http://ck.kolivas.org/patches/4.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatch}.xz
enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz
@@ -158,7 +158,7 @@ _package() {
cd $_srcname
msg2 "Installing boot image..."
- install -Dm644 "$(make -s image_name)" "$pkgdir/boot/vmlinuz-$pkgbase"
+ install -Dm600 "$(make -s image_name)" "$pkgdir/boot/vmlinuz-$pkgbase"
msg2 "Installing modules..."
mkdir -p "$modulesdir"
@@ -212,7 +212,9 @@ _package-headers() {
cp -t "$builddir" -a scripts
# add objtool for external module building and enabled VALIDATION_STACK option
- install -Dt "$builddir/tools/objtool" tools/objtool/objtool
+ if [[ -e tools/objtool/objtool ]]; then
+ install -Dt "$builddir/tools/objtool" tools/objtool/objtool
+ fi
# add xfs and shmem for aufs building
mkdir -p "$builddir"/{fs/xfs,mm}