mirror of
git://slackware.nl/current.git
synced 2025-01-03 23:03:22 +01:00
e0eaf6e451
We're going to go ahead and jump to the 6.1.4 kernel, in spite of the fact
that a kernel bisect identified the patch that was preventing 32-bit from
booting here on a Thinkpad X1E:
------
From 2e479b3b82c49bfb9422274c0a9c155a41caecb7 Mon Sep 17 00:00:00 2001
From: Michael Kelley <mikelley@microsoft.com>
Date: Wed, 16 Nov 2022 10:41:24 -0800
Subject: [PATCH] x86/ioremap: Fix page aligned size calculation in
__ioremap_caller()
commit 4dbd6a3e90e03130973688fd79e19425f720d999 upstream.
Current code re-calculates the size after aligning the starting and
ending physical addresses on a page boundary. But the re-calculation
also embeds the masking of high order bits that exceed the size of
the physical address space (via PHYSICAL_PAGE_MASK). If the masking
removes any high order bits, the size calculation results in a huge
value that is likely to immediately fail.
Fix this by re-calculating the page-aligned size first. Then mask any
high order bits using PHYSICAL_PAGE_MASK.
Fixes: ffa71f33a820 ("x86, ioremap: Fix incorrect physical address handling in
PAE mode")
------
The non-SMP non-PAE 32-bit kernel is fine even without the patch revert.
The PAE kernel also works fine with this patch reverted without any need
to revert ffa71f33a820 (the patch that this one is supposed to fix). The
machine's excessive (for 32-bit) amount of physical RAM (64GB) might also
be a factor here considering the PAE kernel works on all the other machines
around here without reverting this patch.
The patch is reverted only on 32-bit. Upstream report still pending.
Enjoy! :-)
a/kernel-generic-6.1.4-x86_64-1.txz: Upgraded.
a/kernel-huge-6.1.4-x86_64-1.txz: Upgraded.
a/kernel-modules-6.1.4-x86_64-1.txz: Upgraded.
a/tree-2.1.0-x86_64-1.txz: Upgraded.
d/kernel-headers-6.1.4-x86-1.txz: Upgraded.
k/kernel-source-6.1.4-noarch-1.txz: Upgraded.
l/gvfs-1.50.3-x86_64-1.txz: Upgraded.
l/hunspell-1.7.2-x86_64-1.txz: Upgraded.
l/libnice-0.1.21-x86_64-1.txz: Upgraded.
n/tin-2.6.2-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
236 lines
11 KiB
Bash
Executable file
236 lines
11 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
# Copyright 2018, 2020, 2021, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use of this script, with or without modification, is
|
|
# permitted provided that the following conditions are met:
|
|
#
|
|
# 1. Redistributions of this script must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
cd $(dirname $0) ; CWD=$(pwd)
|
|
|
|
PKGNAM=${PKGNAM:-kernel-source}
|
|
BUILD=${BUILD:-1}
|
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
|
TMP=${TMP:-/tmp}
|
|
PKG=$TMP/package-$PKGNAM
|
|
# If CONFIG_PREEMPT=y and CONFIG_PREEMPT_DYNAMIC=y, then set a default preempt
|
|
# mode (none, voluntary, or full):
|
|
CONFIG_PREEMPT_DEFAULT_MODE=${CONFIG_PREEMPT_DEFAULT_MODE:-voluntary}
|
|
|
|
# If a $VERSION is not passed to this script, use the newest linux-*.tar.xz
|
|
# found in this directory:
|
|
VERSION=${VERSION:-$(/bin/ls -t linux-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
|
if ! /bin/ls linux-*.tar.?z 1> /dev/null 2> /dev/null ; then
|
|
echo "Error: kernel source not found. (/bin/ls linux-*.tar.?z)"
|
|
fi
|
|
|
|
# Automatically determine the architecture we're building on:
|
|
if [ -z "$ARCH" ]; then
|
|
case "$(uname -m)" in
|
|
# Use uname -m for all archs:
|
|
*) ARCH=$(uname -m) ;;
|
|
esac
|
|
fi
|
|
|
|
# This function will revert or apply patches that are present here.
|
|
# Directories that are currently supported:
|
|
# patches-revert-${VERSION} (revert patches from this directory if kernel version matches)
|
|
# patches-revert-${ARCH} (revert patches from this directory if $ARCH matches)
|
|
# patches-${VERSION} (apply patches from this directory if kernel version matches)
|
|
# patches-${ARCH} (apply patches from this directory if $ARCH matches)
|
|
# All the applied/reverted patches will be copied to the root of the kernel source tree.
|
|
apply_patches() {
|
|
# First do patches-revert:
|
|
if [ -d $CWD/patches-revert-${VERSION} ]; then
|
|
if [ "$1" = "VERBOSE" ]; then
|
|
echo "Reverting kernel patches in $CWD/patches-revert-${VERSION} and copying patches to $PKG/usr/src/linux-${VERSION}..."
|
|
zcat $CWD/patches-revert-${VERSION}/*.gz | patch -p1 -R --backup --suffix=.orig || exit 1
|
|
else
|
|
zcat $CWD/patches-revert-${VERSION}/*.gz | patch -p1 -R --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1
|
|
fi
|
|
cp -a $CWD/patches-revert-${VERSION}/*.gz .
|
|
fi
|
|
if [ -d $CWD/patches-revert-${ARCH} ]; then
|
|
if [ "$1" = "VERBOSE" ]; then
|
|
echo "Reverting kernel patches in $CWD/patches-revert-${ARCH} and copying patches to $PKG/usr/src/linux-${VERSION}..."
|
|
zcat $CWD/patches-revert-${ARCH}/*.gz | patch -p1 -R --backup --suffix=.orig || exit 1
|
|
else
|
|
zcat $CWD/patches-revert-${ARCH}/*.gz | patch -p1 -R --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1
|
|
fi
|
|
cp -a $CWD/patches-revert-${ARCH}/*.gz .
|
|
fi
|
|
# Then apply patches:
|
|
if [ -d $CWD/patches-${VERSION} ]; then
|
|
if [ "$1" = "VERBOSE" ]; then
|
|
echo "Applying kernel patches in $CWD/patches-${VERSION} and copying patches to $PKG/usr/src/linux-${VERSION}..."
|
|
zcat $CWD/patches-${VERSION}/*.gz | patch -p1 --backup --suffix=.orig || exit 1
|
|
else
|
|
zcat $CWD/patches-${VERSION}/*.gz | patch -p1 --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1
|
|
fi
|
|
cp -a $CWD/patches-${VERSION}/*.gz .
|
|
fi
|
|
if [ -d $CWD/patches-${ARCH} ]; then
|
|
if [ "$1" = "VERBOSE" ]; then
|
|
echo "Applying kernel patches in $CWD/patches-${ARCH} and copying patches to $PKG/usr/src/linux-${VERSION}..."
|
|
zcat $CWD/patches-${ARCH}/*.gz | patch -p1 --backup --suffix=.orig || exit 1
|
|
else
|
|
zcat $CWD/patches-${ARCH}/*.gz | patch -p1 --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1
|
|
fi
|
|
cp -a $CWD/patches-${ARCH}/*.gz .
|
|
fi
|
|
}
|
|
|
|
# Kernel extraversion, such as "-smp" on 32-bit. There's usually no need to set
|
|
# this unless you're using something unusual. We use it to find which .config
|
|
# file to use, but we'll then use whatever CONFIG_LOCALVERSION is set to
|
|
# inside the .config.
|
|
LOCALVERSION=${LOCALVERSION:-""}
|
|
|
|
# If KERNEL_CONFIG (name of kernel .config file in ./kernel-configs to use)
|
|
# has not been passed to this script, then we will select one. We will prefer
|
|
# to use a generic, SMP-supporting .config with a version number exactly
|
|
# matching the kernel sources. But if there's no exact version match, we will
|
|
# start with the newest .config we can find that's of the appropriate type.
|
|
if [ -z "${KERNEL_CONFIG}" ]; then # figure out the best matching .config
|
|
if [ "$ARCH" = "x86_64" ]; then
|
|
CONFIG_SUFFIX=".x64"
|
|
fi
|
|
if [ -z "${LOCALVERSION}" ]; then
|
|
if echo $ARCH | grep -q -E "i?86$" ; then
|
|
# Default to SMP extraversion on 32-bit:
|
|
LOCALVERSION="-smp"
|
|
fi
|
|
fi
|
|
if [ -r "$CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}$LOCALVERSION${CONFIG_SUFFIX}" ]; then
|
|
# Exact match!
|
|
KERNEL_CONFIG="config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}"
|
|
else # no exact match, so find newest with the same name:
|
|
FIND_MATCH="$(/bin/ls -t $CWD/kernel-configs/config-generic${LOCALVERSION}-*${LOCALVERSION}${CONFIG_SUFFIX} 2> /dev/null | head -n 1)"
|
|
if [ -r "${FIND_MATCH}" ]; then
|
|
KERNEL_CONFIG="$(basename ${FIND_MATCH})"
|
|
unset FIND_MATCH
|
|
else
|
|
echo "Error: no matching .config file could be found for this kernel. Tried:"
|
|
echo " $CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} (not found)"
|
|
exit 1
|
|
fi
|
|
fi
|
|
else # We were given a name to use:
|
|
if [ ! -r "$CWD/kernel-configs/${KERNEL_CONFIG}" ]; then
|
|
echo "Error: specified kernel .config $CWD/kernel-configs/${KERNEL_CONFIG} was not found."
|
|
exit 1
|
|
fi
|
|
fi
|
|
# Set LOCALVERSION to the value found inside the .config:
|
|
LOCALVERSION="$(cat $CWD/kernel-configs/${KERNEL_CONFIG} | grep CONFIG_LOCALVERSION= | cut -f 2 -d = | tr -d \")"
|
|
|
|
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
|
# the name of the created package would be, and then exit. This information
|
|
# could be useful to other scripts.
|
|
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
|
# We will have to extract and patch the kernel sources to find out the kernel version:
|
|
TEMPDIR=$(mktemp -d)
|
|
cd $TEMPDIR
|
|
tar xf $CWD/linux-${VERSION}.tar.?z || exit 1
|
|
cd linux*
|
|
apply_patches
|
|
PACKAGE_VERSION=$(grep "^VERSION = " Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^PATCHLEVEL = " Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^SUBLEVEL = " Makefile | rev | cut -f 1 -d ' ' | rev)$(grep "^EXTRAVERSION = " Makefile | rev | cut -f 1 -d ' ' | rev)
|
|
cd $CWD
|
|
rm -rf $TEMPDIR
|
|
echo "kernel-source-$(echo ${PACKAGE_VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-noarch-$BUILD.txz"
|
|
exit 0
|
|
fi
|
|
|
|
echo "Using kernel config: $CWD/kernel-configs/${KERNEL_CONFIG}"
|
|
|
|
rm -rf $PKG
|
|
mkdir -p $TMP $PKG
|
|
mkdir -p $PKG/usr/src
|
|
|
|
echo "Untarring $CWD/linux-${VERSION}.tar.?z in $PKG/usr/src..."
|
|
( cd $PKG/usr/src
|
|
tar xf $CWD/linux-${VERSION}.tar.?z || exit 1
|
|
echo "Making /usr/src/linux symlink..."
|
|
ln -sf linux-* linux
|
|
cd linux-*
|
|
apply_patches VERBOSE
|
|
echo "Copying $CWD/kernel-configs/${KERNEL_CONFIG} to .config..."
|
|
cp -a $CWD/kernel-configs/${KERNEL_CONFIG} .config
|
|
echo "Fixing permissions/ownership..."
|
|
chown -R root:root .
|
|
find . \
|
|
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
|
-exec chmod 755 {} \+ -o \
|
|
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
|
-exec chmod 644 {} \+
|
|
) || exit 1
|
|
|
|
# Kernel is now ready to configure. We will also build this kernel so that
|
|
# the installed kernel source package is fully configured, and building an
|
|
# out-of-tree module (such as the NVIDIA driver) won't require the user
|
|
# to build the kernel sources first.
|
|
( cd $PKG/usr/src/linux-${VERSION}
|
|
echo "Making oldconfig..."
|
|
make oldconfig
|
|
if [ ! -r $CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} ]; then
|
|
echo "Saving new .config as: $CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}"
|
|
cp -a .config $CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}
|
|
fi
|
|
|
|
# If CONFIG_PREEMPT=y and CONFIG_PREEMPT_DYNAMIC=y, then set a default preempt
|
|
# mode (none, voluntary, or full):
|
|
if grep -wq CONFIG_PREEMPT=y .config ; then
|
|
if grep -wq CONFIG_PREEMPT_DYNAMIC=y .config ; then
|
|
# Sanity check:
|
|
if ! echo $CONFIG_PREEMPT_DEFAULT_MODE | grep -wq -e none -e voluntary -e full ; then
|
|
echo "ERROR: Invalid mode for CONFIG_PREEMPT_DEFAULT_MODE: $CONFIG_PREEMPT_DEFAULT_MODE"
|
|
exit 1
|
|
fi
|
|
echo "Setting default PREEMPT mode: $CONFIG_PREEMPT_DEFAULT_MODE"
|
|
sed -i "s/^int preempt_dynamic_mode = preempt_dynamic_full;$/int preempt_dynamic_mode = preempt_dynamic_$CONFIG_PREEMPT_DEFAULT_MODE;/g" kernel/sched/core.c
|
|
fi
|
|
fi
|
|
|
|
echo "Building kernel and modules (needed before clean for building NVIDIA to work)..."
|
|
make ${NUMJOBS} || exit 1
|
|
make ${NUMJOBS} modules || exit 1
|
|
echo "Cleaning up..."
|
|
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
|
|
find . -name "*.cmd" -exec rm -f "{}" \+
|
|
rm .*.d
|
|
# Still some dotfiles laying around... probably fine though
|
|
) || exit 1
|
|
|
|
cd $PKG/usr/src/linux-${VERSION}
|
|
# Use the version number found in the Makefile in the package name. This is not
|
|
# always the same as the version in the source tarball's filename. For example,
|
|
# linux-4.14.tar.xz will have 4.14.0 as the version in the Makefile:
|
|
PACKAGE_VERSION=$(grep "^VERSION = " Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^PATCHLEVEL = " Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^SUBLEVEL = " Makefile | rev | cut -f 1 -d ' ' | rev)$(grep "^EXTRAVERSION = " Makefile | rev | cut -f 1 -d ' ' | rev)
|
|
|
|
mkdir $PKG/install
|
|
cat $CWD/slack-desc/slack-desc.kernel-source > $PKG/install/slack-desc
|
|
|
|
# Make the package:
|
|
cd $PKG
|
|
/sbin/makepkg -l y -c n $TMP/kernel-source-$(echo ${PACKAGE_VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-noarch-$BUILD.txz
|
|
|