From 83a617b77aff105b3d3c143674aba80cffb07089 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 25 Jan 2019 00:23:40 -0800
Subject: Updated aliases on source | Create vmlinuz as 600 | Add if around
 objtool

---
 PKGBUILD | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index d55ae39..3f5f86f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ _gnumajver=${_majver}-gnu
 _gnupkgver=${_pkgver}-gnu
 _hardenedver=a
 _gcc_more_v='20180509'
-_srcname=linux-${_majver}
+_srcname=linux-${_pkgver}
 pkgver=${_pkgver}.${_hardenedver}
 pkgrel=1
 url='https://github.com/anthraxx/linux-hardened'
@@ -35,7 +35,7 @@ conflicts=('linux-hardened')
 options=('!strip')
 source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
         https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.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}
         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
         config.x86_64  # the main kernel config files
@@ -147,7 +147,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"
@@ -201,7 +201,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}
-- 
cgit v1.2.1