From c1219d83a070dacff0500f77ece0556ed38986ad Mon Sep 17 00:00:00 2001 From: Josip Ponjavic Date: Mon, 3 Dec 2018 13:16:27 +0100 Subject: [PATCH] 4.19.6-2 (clr 4.19.6-666) --- .SRCINFO | 4 ++-- PKGBUILD | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7952521..9e089dd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear pkgver = 4.19.6 - pkgrel = 1 + pkgrel = 2 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 license = GPL2 @@ -15,7 +15,7 @@ pkgbase = linux-clear source = https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.sign source = https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.19.6.xz - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.19.5-665 + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=4.19.6-666 source = https://downloadmirror.intel.com/28039/eng/microcode-20180807.tgz source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz source = 60-linux.hook diff --git a/PKGBUILD b/PKGBUILD index 8e56010..574b2c6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -47,9 +47,7 @@ _subarch=27 # that you currently have probed in your system VASTLY reducing the number of # modules built and the build time to do it. # -# WARNING - ALL modules must be probed or loaded via a config file BEFORE you -# begin making the pkg unless you're running modprobed-db (AUR) and building -# this with makepkg as the user who is keeping the database. +# WARNING - ALL modules must be probed BEFORE you begin making the pkg! # # To keep track of which modules are needed for your specific system/hardware, # give module_db script a try: https://aur.archlinux.org/packages/modprobed-db @@ -68,10 +66,10 @@ _rev_override="n" _major=4.19 _minor=6 _srcname=linux-${_major} -_clr=${_major}.5-665 +_clr=${_major}.6-666 pkgbase=linux-clear pkgver=${_major}.${_minor} -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://github.com/clearlinux-pkgs/linux" license=('GPL2') @@ -164,11 +162,12 @@ CONFIG_MODULE_COMPRESS_XZ=y|' ./.config ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -f $HOME/.config/modprobed.db ]; then - msg2 "Found a modprobed-db database for Steven Rostedt's make localmodconfig" - make LSMOD=$HOME/.config/modprobed.db localmodconfig - else - msg2 "Running Steven Rostedt's make localmodconfig now" + msg2 "If you have modprobed-db installed, running it in recall mode now" + if [ -e /usr/bin/modprobed-db ]; then + [[ -x /usr/bin/sudo ]] || { + echo "Cannot call modprobe with sudo. Install sudo and configure it to work with this user." + exit 1; } + sudo /usr/bin/modprobed-db recall make localmodconfig fi fi