summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoranthraxx2019-11-23 22:30:05 +0100
committeranthraxx2019-11-23 22:30:05 +0100
commitd45018930ef3991464d390e04f8c11e65fb1a798 (patch)
treede3019b9ed75180b42fad6adc07b1d97ba376e6a
parent8004f78990110d537f4381ee1e646ed4c099f47b (diff)
downloadaur-d45018930ef3991464d390e04f8c11e65fb1a798.tar.gz
upgpkg: 5.4.0rc8.r873393.g33c8300eac3b-1: remove vmlinuz, update config
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD36
-rw-r--r--config5
3 files changed, 30 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 136bb6dc0bd..86e96cb336f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,6 @@
pkgbase = linux-hardened-git
- pkgver = 5.4.0rc5.r872441.g5061ca987e29
+ pkgdesc = Security-Hardened Linux
+ pkgver = 5.4.0rc8.r873393.g33c8300eac3b
pkgrel = 1
url = https://github.com/anthraxx/linux-hardened
arch = x86_64
@@ -22,10 +23,10 @@ pkgbase = linux-hardened-git
validpgpkeys = 65EEFE022108E2B708CBFCF7F9E712E59AF5F22A
validpgpkeys = E240B57E2C4630BA768E2F26FC1B547C8D8172C8
sha256sums = SKIP
- sha256sums = 770af4cd36af968e9fea41417f5d02cae03fa7a1bce1d5ebc45e3e7d2b214425
+ sha256sums = 8fd3e3e5be7c1f6378959292808769bedea93987f80daf14b6d196741788eea2
pkgname = linux-hardened-git
- pkgdesc = The Linux-hardened-git kernel and modules
+ pkgdesc = The Security-Hardened Linux kernel and modules
depends = coreutils
depends = kmod
depends = initramfs
@@ -35,10 +36,10 @@ pkgname = linux-hardened-git
provides = linux-hardened
pkgname = linux-hardened-headers-git
- pkgdesc = Header files and scripts for building modules for Linux-hardened-git kernel
+ pkgdesc = Headers and scripts for building modules for the Security-Hardened Linux kernel
provides = linux-hardened-headers
pkgname = linux-hardened-docs-git
- pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-hardened-git kernel
+ pkgdesc = Kernel hacker's manual for the Security-Hardened Linux kernel
provides = linux-hardened-docs
diff --git a/PKGBUILD b/PKGBUILD
index 33119fc1c88..67cfb6c8cc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,27 +6,32 @@
pkgbase=linux-hardened-git
_srcname=${pkgbase/-git/}
_gitbranch=5.4
-pkgver=5.4.0rc5.r872441.g5061ca987e29
+pkgver=5.4.0rc8.r873393.g33c8300eac3b
pkgrel=1
+pkgdesc='Security-Hardened Linux'
url='https://github.com/anthraxx/linux-hardened'
arch=(x86_64)
license=(GPL2)
makedepends=(
- xmlto kmod inetutils bc libelf python-sphinx python-sphinx_rtd_theme
- graphviz imagemagick git
+ xmlto kmod inetutils bc libelf
+ python-sphinx python-sphinx_rtd_theme graphviz imagemagick git
)
options=('!strip')
source=("${_srcname}::git+https://github.com/anthraxx/linux-hardened#branch=${_gitbranch}?signed"
config # the main kernel config files
)
-sha256sums=('SKIP'
- '770af4cd36af968e9fea41417f5d02cae03fa7a1bce1d5ebc45e3e7d2b214425')
validpgpkeys=(
- 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
- '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
- '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
- 'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
- )
+ 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
+ '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
+ '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
+ 'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
+)
+sha256sums=('SKIP'
+ '8fd3e3e5be7c1f6378959292808769bedea93987f80daf14b6d196741788eea2')
+
+export KBUILD_BUILD_HOST=archlinux
+export KBUILD_BUILD_USER=$pkgbase
+export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
pkgver() {
cd $_srcname
@@ -72,7 +77,7 @@ build() {
}
_package() {
- pkgdesc="The ${pkgbase/linux/Linux} kernel and modules"
+ pkgdesc="The $pkgdesc kernel and modules"
depends=(coreutils kmod initramfs)
optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices'
@@ -86,7 +91,6 @@ _package() {
# systemd expects to find the kernel here to allow hibernation
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
- install -Dm644 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase"
# Used by mkinitcpio to name the kernel
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
@@ -102,7 +106,7 @@ _package() {
}
_package-headers() {
- pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
+ pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
cd $_srcname
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -180,7 +184,7 @@ _package-headers() {
}
_package-docs() {
- pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
+ pkgdesc="Kernel hacker's manual for the $pkgdesc kernel"
cd $_srcname
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -189,8 +193,8 @@ _package-docs() {
mkdir -p "$builddir"
cp -t "$builddir" -a Documentation
- msg2 "Removing doctrees..."
- rm -r "$builddir/Documentation/output/.doctrees"
+ msg2 "Removing unneeded files..."
+ rm -rv "$builddir"/Documentation/{,output/}.[^.]*
msg2 "Moving HTML docs..."
local src dst
diff --git a/config b/config
index b451f835185..ad479d0c382 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-rc5 Kernel Configuration
+# Linux/x86 5.4.0-rc8 Kernel Configuration
#
#
@@ -444,6 +444,9 @@ CONFIG_X86_SMAP=y
CONFIG_X86_INTEL_UMIP=y
# CONFIG_X86_INTEL_MPX is not set
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+CONFIG_X86_INTEL_TSX_MODE_AUTO=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_EFI_MIXED=y