Wed Nov 6 21:14:40 UTC 201920191106211440

a/cpio-2.13-x86_64-1.txz:  Upgraded.
a/kernel-generic-4.19.82-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.82-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.82-x86_64-1.txz:  Upgraded.
ap/hplip-3.19.11-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.82-x86-1.txz:  Upgraded.
d/mercurial-5.2-x86_64-1.txz:  Upgraded.
k/kernel-source-4.19.82-noarch-1.txz:  Upgraded.
l/python-six-1.13.0-x86_64-1.txz:  Upgraded.
l/shared-mime-info-1.15-x86_64-1.txz:  Upgraded.
l/zstd-1.4.4-x86_64-1.txz:  Upgraded.
n/ModemManager-1.12.0-x86_64-1.txz:  Upgraded.
n/NetworkManager-1.20.6-x86_64-1.txz:  Upgraded.
n/curl-7.67.0-x86_64-1.txz:  Upgraded.
n/libmbim-1.20.2-x86_64-1.txz:  Upgraded.
x/mesa-19.2.3-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

10 files changed, 40 insertions, 13 deletions

diff --git a/source/k/build-all-kernels.sh b/source/k/build-all-kernels.sh
index b1ea68907..5d1d5daac 100755
--- a/source/k/build-all-kernels.sh
+++ b/source/k/build-all-kernels.sh
@@ -29,14 +29,23 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 BUILD=${BUILD:-1}
 if [ -z "$VERSION" ]; then
-  # Get $VERSION from the newest kernel tarball:
-  VERSION=${VERSION:-$(/bin/ls -t linux-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+  # Get the filename of the newest kernel tarball:
+  KERNEL_SOURCE_FILE="$(/bin/ls -t linux-*.tar.?z | head -n 1 )"
+  if echo $KERNEL_SOURCE_FILE | grep -q rc ; then # need to get rc versions a bit differently
+    VERSION=$(/bin/ls -t linux-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)
+  else # normal release version
+    VERSION=$(/bin/ls -t linux-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+  fi
 fi
 TMP=${TMP:-/tmp}
 
 # By default, install the packages as we build them and update the initrd.
 INSTALL_PACKAGES=${INSTALL_PACKAGES:-YES}
 
+# Clean kernels before building them. Not doing so quit working some time
+# after 4.19.x.
+export KERNEL_CLEAN=YES
+
 # A list of recipes for build may be passed in the $RECIPES variable, otherwise
 # we have defaults based on uname -m:
 if [ -z "$RECIPES" ]; then
@@ -131,12 +140,12 @@ for recipe in $RECIPES ; do
 
   # Update initrd:
   if [ "${INSTALL_PACKAGES}" = "YES" ]; then
-    # We should already have this...
-    #LOCALVERSION="$(cat $TMP/package-kernel-source/usr/src/linux/.config 2> /dev/null | grep CONFIG_LOCALVERSION= | cut -f 2 -d = | tr -d \")"
+    INITRD_VERSION="$(grep "Kernel Configuration" $TMP/package-kernel-source/usr/src/linux/.config | cut -f 3 -d ' ')"
+    INITRD_LOCALVERSION="$(cat $TMP/package-kernel-source/usr/src/linux/.config 2> /dev/null | grep CONFIG_LOCALVERSION= | cut -f 2 -d = | tr -d \")"
     if [ -r /etc/mkinitrd.conf ]; then
-      mkinitrd -F /etc/mkinitrd.conf -k ${VERSION}${LOCALVERSION}
+      mkinitrd -F /etc/mkinitrd.conf -k ${INITRD_VERSION}${INITRD_LOCALVERSION}
     else # try this?
-      sh /usr/share/mkinitrd/mkinitrd_command_generator.sh -k ${VERSION}${LOCALVERSION} | sed "s/-c -k/-k/g" | bash
+      sh /usr/share/mkinitrd/mkinitrd_command_generator.sh -k ${INITRD_VERSION}${INITRD_LOCALVERSION} | sed "s/-c -k/-k/g" | bash
     fi
   fi
 
diff --git a/source/k/kernel-configs/config-generic-4.19.81 b/source/k/kernel-configs/config-generic-4.19.82
index d972b3721..a5d987c49 100644
--- a/source/k/kernel-configs/config-generic-4.19.81
+++ b/source/k/kernel-configs/config-generic-4.19.82
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.81 Kernel Configuration
+# Linux/x86 4.19.82 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-4.19.81.x64 b/source/k/kernel-configs/config-generic-4.19.82.x64
index ce88bfe41..1b8396740 100644
--- a/source/k/kernel-configs/config-generic-4.19.81.x64
+++ b/source/k/kernel-configs/config-generic-4.19.82.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.81 Kernel Configuration
+# Linux/x86 4.19.82 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-4.19.81-smp b/source/k/kernel-configs/config-generic-smp-4.19.82-smp
index 3c80869bb..9b5987013 100644
--- a/source/k/kernel-configs/config-generic-smp-4.19.81-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.19.82-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.81 Kernel Configuration
+# Linux/x86 4.19.82 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-4.19.81 b/source/k/kernel-configs/config-huge-4.19.82
index fc31401df..7f06c286c 100644
--- a/source/k/kernel-configs/config-huge-4.19.81
+++ b/source/k/kernel-configs/config-huge-4.19.82
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.81 Kernel Configuration
+# Linux/x86 4.19.82 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-4.19.81.x64 b/source/k/kernel-configs/config-huge-4.19.82.x64
index fba402490..258b1a79a 100644
--- a/source/k/kernel-configs/config-huge-4.19.81.x64
+++ b/source/k/kernel-configs/config-huge-4.19.82.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.81 Kernel Configuration
+# Linux/x86 4.19.82 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-4.19.81-smp b/source/k/kernel-configs/config-huge-smp-4.19.82-smp
index 8d204f4bb..b2cadf8b4 100644
--- a/source/k/kernel-configs/config-huge-smp-4.19.81-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.19.82-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.81 Kernel Configuration
+# Linux/x86 4.19.82 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-generic.SlackBuild b/source/k/kernel-generic.SlackBuild
index 4b31162a2..76ae14524 100755
--- a/source/k/kernel-generic.SlackBuild
+++ b/source/k/kernel-generic.SlackBuild
@@ -97,6 +97,14 @@ if [ ! -z "${KERNEL_CLEAN}" ]; then
   ( cd ${KERNEL_SOURCE}
     echo "Cleaning kernel source (make clean)..."
     make clean
+    # Make sure header files aren't missing...
+    make prepare
+    # Don't package the kernel in the sources:
+    find . -name "*Image" -exec rm "{}" \+
+    # No need for these:
+    rm -f .config.old .version modules.*
+    find . -name "*.cmd" -exec rm -f "{}" \+
+    rm .*.d
   )
 fi
 
diff --git a/source/k/kernel-modules.SlackBuild b/source/k/kernel-modules.SlackBuild
index 8bf42a5ec..891dc5131 100755
--- a/source/k/kernel-modules.SlackBuild
+++ b/source/k/kernel-modules.SlackBuild
@@ -83,6 +83,14 @@ if [ ! -z "${KERNEL_CLEAN}" ]; then
   ( cd ${KERNEL_SOURCE}
     echo "Cleaning kernel source (make clean)..."
     make clean
+    # Make sure header files aren't missing...
+    make prepare
+    # Don't package the kernel in the sources:
+    find . -name "*Image" -exec rm "{}" \+
+    # No need for these:
+    rm -f .config.old .version modules.*
+    find . -name "*.cmd" -exec rm -f "{}" \+
+    rm .*.d
   )
 fi
 
@@ -95,6 +103,8 @@ fi
 ( cd ${KERNEL_SOURCE}
   echo "Running make oldconfig..."
   make oldconfig
+  echo "Running a preliminary make (needed to create modules.builtin.modinfo)..."
+  make $NUMJOBS || exit 1
   echo "Building kernel modules..."
   make $NUMJOBS modules || exit 1
   echo "Installing kernel modules to $PKG..."
diff --git a/source/k/kernel-source.SlackBuild b/source/k/kernel-source.SlackBuild
index 866e94b7d..26b5ed924 100755
--- a/source/k/kernel-source.SlackBuild
+++ b/source/k/kernel-source.SlackBuild
@@ -155,7 +155,7 @@ echo "Untarring $CWD/linux-${VERSION}.tar.?z in $PKG/usr/src..."
   # Don't package the kernel in the sources:
   find . -name "*Image" -exec rm "{}" \+
   # No need for these:
-  rm -f .config.old .version
+  rm -f .config.old .version modules.*
   find . -name "*.cmd" -exec rm -f "{}" \+ 
   rm .*.d
   # Still some dotfiles laying around... probably fine though