From 7716b728c18deb9a2c780e148050e3683d4d93c1 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 10 Oct 2018 23:09:36 +0000
Subject: Wed Oct 10 23:09:36 UTC 2018

a/kernel-firmware-20181008_c6b6265-noarch-1.txz:  Upgraded.
a/kernel-generic-4.14.75-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.75-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.75-x86_64-1.txz:  Upgraded.
d/git-2.19.1-x86_64-1.txz:  Upgraded.
  Submodules' "URL"s come from the untrusted .gitmodules file, but we
  blindly gave it to "git clone" to clone submodules when "git clone
  --recurse-submodules" was used to clone a project that has such a
  submodule. The code has been hardened to reject such malformed URLs
  (e.g. one that begins with a dash). Credit for finding and fixing this
  vulnerability goes to joernchen and Jeff King, respectively.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17456
  (* Security fix *)
d/kernel-headers-4.14.75-x86-1.txz:  Upgraded.
d/make-4.2.1-x86_64-4.txz:  Rebuilt.
  Use a non-blocking read with pselect to avoid hangs.
  Thanks to Linux.tar.gz and David Spencer.
d/subversion-1.10.3-x86_64-1.txz:  Upgraded.
k/kernel-source-4.14.75-noarch-1.txz:  Upgraded.
  Config changes since 4.14.74:
  FB_HYPERV n -> m
  Thanks to walecha.
l/librsvg-2.44.7-x86_64-1.txz:  Upgraded.
l/python-pillow-5.3.0-x86_64-1.txz:  Upgraded.
n/nghttp2-1.34.0-x86_64-1.txz:  Upgraded.
x/libSM-1.2.3-x86_64-1.txz:  Upgraded.
x/libX11-1.6.7-x86_64-1.txz:  Upgraded.
x/libdrm-2.4.95-x86_64-1.txz:  Upgraded.
x/libxcb-1.13.1-x86_64-1.txz:  Upgraded.
x/vulkan-sdk-1.1.85.0-x86_64-1.txz:  Upgraded.
  Thanks to dugan.
xap/gnuplot-5.2.5-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/installer/build_installer.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'source/installer/build_installer.sh')

diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 954bc4a5..a358e180 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1429,7 +1429,11 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do
     mv staging staging.orig
     mv staging.orig/hv staging
     rm -rf${VERBOSE1} staging.orig
+    # Save the Hyper-V keyboard module:
+    mkdir -p input.orig/serio
+    cp -a input/serio/hyperv-keyboard.ko input.orig/serio
     rm -rf${VERBOSE1} ata atm bluetooth clocksource connector crypto dma idle infiniband input isdn kvm leds media memstick message mfd misc pci power rtc serial telephony uwb w1 watchdog
+    mv input.orig input
 
     if [ "$ADD_KMS" = "1" ]; then
       # Keep video.ko and button.ko, needed by some gpu drivers.
@@ -1466,11 +1470,16 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do
 
       # Keep some video drivers:
       mv video video.orig
-      mkdir video
+      mkdir -p video/fbdev
       mv video.orig/{sis,syscopyarea.ko,sysfillrect.ko,sysimgblt.ko} video
+      mv video.orig/fbdev/hyperv_fb.ko video/fbdev
       rm -rf${VERBOSE1} video.orig
     else
-      rm -rf${VERBOSE1} acpi char cpufreq hwmon platform thermal video
+      # Save the Hyper-V framebuffer module:
+      mv video video.orig
+      mkdir -p video/fbdevmv
+      mv video.orig/fbdev/hyperv_fb.ko video/fbdev
+      rm -rf${VERBOSE1} acpi char cpufreq hwmon platform thermal video.orig
     fi
 
     # Needed to install on MMC:
-- 
cgit v1.2.3