4.19.71-3 (clr 4.19.69-74) sync with linux-clear

3 files changed, 14 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd83f6f9582f..1ea8b52b1704 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = linux-clear-lts2018
 	pkgver = 4.19.71
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/clearlinux-pkgs/linux-lts2018
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
+	makedepends = cpio
 	makedepends = git
 	makedepends = inetutils
 	makedepends = kmod
diff --git a/PKGBUILD b/PKGBUILD
index deb86ca2963e..bc77ef4dc390 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,11 +64,11 @@ _srcname=linux-${_major}
 _clr=${_major}.69-74
 pkgbase=linux-clear-lts2018
 pkgver=${_major}.${_minor}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://github.com/clearlinux-pkgs/linux-lts2018"
 license=('GPL2')
-makedepends=('bc' 'git' 'inetutils' 'kmod' 'libelf' 'xmlto')
+makedepends=('bc' 'cpio' 'git' 'inetutils' 'kmod' 'libelf' 'xmlto')
 options=('!strip')
 _gcc_more_v='20190822'
 source=(
@@ -114,11 +114,12 @@ prepare() {
 CONFIG_MODULE_COMPRESS=y\
 # CONFIG_MODULE_COMPRESS_GZIP is not set\
 CONFIG_MODULE_COMPRESS_XZ=y|' ./.config
-        sed -i "s|# CONFIG_CRYPTO_USER is not set|CONFIG_CRYPTO_USER=m|g" ./.config
         sed -i "s|# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set|CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y|g" ./.config
         sed -i "s|# CONFIG_HIBERNATION is not set|CONFIG_HIBERNATION=y|g" ./.config
         sed -i "s|# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set|CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y|g" ./.config
         sed -i "s|CONFIG_RT_GROUP_SCHED=y|# CONFIG_RT_GROUP_SCHED is not set|g" ./.config
+        sed -i "s|# CONFIG_DELL_SMBIOS_SMM is not set|CONFIG_DELL_SMBIOS_SMM=y|g" ./.config
+        sed -i "s|CONFIG_MODULE_SIG_FORCE=y|# CONFIG_MODULE_SIG_FORCE is not set|g" ./.config
         sed -i "s|# CONFIG_NET_SCH_CAKE is not set|CONFIG_NET_SCH_CAKE=m|g" ./.config
 
         make olddefconfig
diff --git a/linux.install b/linux.install
index bb2f675cbb05..f72587572988 100644
--- a/linux.install
+++ b/linux.install
@@ -1,3 +1,11 @@
+
+post_install() {
+  echo ":: Adjust kernel command line in your bootloader to Clear Linux kernel default:"
+  echo "   quiet console=tty0 console=ttyS0,115200n8 cryptomgr.notests initcall_debug"
+  echo "   intel_iommu=igfx_off kvm-intel.nested=1 no_timer_check noreplace-smp"
+  echo "   rcu_nocbs=0-64 rcupdate.rcu_expedited=1 rootfstype=ext4,btrfs,xfs tsc=reliable rw"
+}
+
 post_upgrade() {
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."