diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-12-11 22:18:13 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-12-12 00:13:38 +0100 |
commit | b04af892853e58c426e27bff4f0acbcd3d524f06 (patch) | |
tree | e9533c5926d3af95babd530c517d5940d6efe9b7 /testing | |
parent | 523624d48084b79e858d4b62b68dd5335ad70232 (diff) | |
download | current-b04af892853e58c426e27bff4f0acbcd3d524f06.tar.gz current-b04af892853e58c426e27bff4f0acbcd3d524f06.tar.xz |
Mon Dec 11 22:18:13 UTC 202320231211221813
We've gone ahead and moved the 6.6 kernel into the main tree. As previously
mentioned when this branch first appeared in /testing, on the 32-bit side
there are no longer any -smp labeled kernel packages, so if you were using
those previously, you'll need to switch to using to kernel-generic or
kernel-huge kernel, including the changes needed to your bootloader setup to
load this instead of the -smp labeled kernel. Also, if you happen to be using
a first generation Pentium M chip, you will need to append forcepae to your
kernel command-line options. Enjoy! :-)
a/kernel-firmware-20231211_f2e52a1-noarch-1.txz: Upgraded.
a/kernel-generic-6.6.6-x86_64-1.txz: Upgraded.
a/kernel-huge-6.6.6-x86_64-1.txz: Upgraded.
a/kernel-modules-6.6.6-x86_64-1.txz: Upgraded.
ap/qpdf-11.6.4-x86_64-1.txz: Upgraded.
d/kernel-headers-6.6.6-x86-1.txz: Upgraded.
k/kernel-source-6.6.6-noarch-1.txz: Upgraded.
l/imagemagick-7.1.1_23-x86_64-1.txz: Upgraded.
l/libsecret-0.21.2-x86_64-1.txz: Upgraded.
Thanks to reddog83 and saxa.
l/zxing-cpp-2.2.1-x86_64-1.txz: Upgraded.
n/postfix-3.8.3-x86_64-2.txz: Rebuilt.
OpenSSL upstream says that major versions are ABI/API compatible, so stop
warning in the logs that they might not be.
Thanks to gildbg and Markus Wiesner.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to '')
20 files changed, 4 insertions, 995 deletions
diff --git a/testing/source/linux-6.6.x/kernel-configs/config-generic-6.6.5 b/source/k/kernel-configs/config-generic-6.6.6 index fd2077ef5..60308861b 100644 --- a/testing/source/linux-6.6.x/kernel-configs/config-generic-6.6.5 +++ b/source/k/kernel-configs/config-generic-6.6.6 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.5 Kernel Configuration +# Linux/x86 6.6.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.6.x/kernel-configs/config-generic-6.6.5.x64 b/source/k/kernel-configs/config-generic-6.6.6.x64 index 3046c487a..980571bea 100644 --- a/testing/source/linux-6.6.x/kernel-configs/config-generic-6.6.5.x64 +++ b/source/k/kernel-configs/config-generic-6.6.6.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.5 Kernel Configuration +# Linux/x86 6.6.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.6.x/kernel-configs/config-huge-6.6.5 b/source/k/kernel-configs/config-huge-6.6.6 index cb8c82f75..ff854fbce 100644 --- a/testing/source/linux-6.6.x/kernel-configs/config-huge-6.6.5 +++ b/source/k/kernel-configs/config-huge-6.6.6 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.5 Kernel Configuration +# Linux/x86 6.6.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.6.x/kernel-configs/config-huge-6.6.5.x64 b/source/k/kernel-configs/config-huge-6.6.6.x64 index 12d961623..7a89a6943 100644 --- a/testing/source/linux-6.6.x/kernel-configs/config-huge-6.6.5.x64 +++ b/source/k/kernel-configs/config-huge-6.6.6.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.5 Kernel Configuration +# Linux/x86 6.6.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-generic.i686 b/source/k/slack-desc/slack-desc.kernel-generic.i686 index 85dbe6b19..85dbe6b19 100644 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-generic.i686 +++ b/source/k/slack-desc/slack-desc.kernel-generic.i686 diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-huge.i686 b/source/k/slack-desc/slack-desc.kernel-huge.i686 index 7317c99b3..7317c99b3 100644 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-huge.i686 +++ b/source/k/slack-desc/slack-desc.kernel-huge.i686 diff --git a/testing/source/linux-6.6.x/build-all-kernels.sh b/testing/source/linux-6.6.x/build-all-kernels.sh deleted file mode 100755 index e4b907bae..000000000 --- a/testing/source/linux-6.6.x/build-all-kernels.sh +++ /dev/null @@ -1,170 +0,0 @@ -#!/bin/sh - -# Copyright 2018, 2021, 2022, 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. - -# This script uses the SlackBuild scripts present here to build a -# complete set of kernel packages for the currently running architecture. -# It needs to be run once on 64-bit (uname -m = x86_64) and once on IA32 -# (uname -m = i586 or i686). - -cd $(dirname $0) ; CWD=$(pwd) - -BUILD=${BUILD:-1} -if [ -z "$VERSION" ]; then - # 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 - if uname -m | grep -wq x86_64 ; then - RECIPES="x86_64" - elif uname -m | grep -wq i.86 ; then - RECIPES="IA32" - else - echo "Error: no build recipes available for $(uname -m)" - exit 1 - fi -fi - -# Main build loop: -for recipe in $RECIPES ; do - - # Build recipes are defined here. These will select the appropriate .config - # files and package naming scheme, and define the output location. - if [ "$recipe" = "x86_64" ]; then - # Recipe for x86_64: - export CONFIG_SUFFIX=".x64" - unset LOCALVERSION - OUTPUT=${OUTPUT:-${TMP}/output-x86_64-${VERSION}} - elif [ "$recipe" = "IA32" ]; then - # Recipe for IA32: - unset CONFIG_SUFFIX - unset LOCALVERSION - OUTPUT=${OUTPUT:-${TMP}/output-ia32-${VERSION}} - else - echo "Error: recipe ${recipe} not implemented" - exit 1 - fi - - echo - echo "*************************************************" - echo "* Building kernels for recipe ${recipe}..." - echo "*************************************************" - echo - - # Build kernel-source package: - KERNEL_SOURCE_PACKAGE_NAME=$(PRINT_PACKAGE_NAME=YES KERNEL_CONFIG="config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}" VERSION=$VERSION BUILD=$BUILD ./kernel-source.SlackBuild) - KERNEL_CONFIG="config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}" VERSION=$VERSION BUILD=$BUILD ./kernel-source.SlackBuild - mkdir -p $OUTPUT - mv ${TMP}/${KERNEL_SOURCE_PACKAGE_NAME} $OUTPUT || exit 1 - if [ "${INSTALL_PACKAGES}" = "YES" ]; then - installpkg ${OUTPUT}/${KERNEL_SOURCE_PACKAGE_NAME} || exit 1 - fi - - # Build kernel-huge package: - # We will build in the just-built kernel tree. First, let's put back the - # symlinks: - ( cd $TMP/package-kernel-source - sh install/doinst.sh - ) - KERNEL_HUGE_PACKAGE_NAME=$(PRINT_PACKAGE_NAME=YES KERNEL_NAME=huge KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-huge${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/huge$(echo ${LOCALVERSION} | tr -d -).s BUILD=$BUILD ./kernel-generic.SlackBuild) - KERNEL_NAME=huge KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-huge${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/huge$(echo ${LOCALVERSION} | tr -d -).s BUILD=$BUILD ./kernel-generic.SlackBuild - if [ -r ${TMP}/${KERNEL_HUGE_PACKAGE_NAME} ]; then - mv ${TMP}/${KERNEL_HUGE_PACKAGE_NAME} $OUTPUT - else - echo "kernel-source build failed." - exit 1 - fi - if [ "${INSTALL_PACKAGES}" = "YES" ]; then - installpkg ${OUTPUT}/${KERNEL_HUGE_PACKAGE_NAME} || exit 1 - fi - - # Build kernel-generic package: - KERNEL_GENERIC_PACKAGE_NAME=$(PRINT_PACKAGE_NAME=YES KERNEL_NAME=generic KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/generic$(echo ${LOCALVERSION} | tr -d -).s BUILD=$BUILD ./kernel-generic.SlackBuild) - KERNEL_NAME=generic KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/generic$(echo ${LOCALVERSION} | tr -d -).s BUILD=$BUILD ./kernel-generic.SlackBuild - if [ -r ${TMP}/${KERNEL_GENERIC_PACKAGE_NAME} ]; then - mv ${TMP}/${KERNEL_GENERIC_PACKAGE_NAME} $OUTPUT - else - echo "kernel-generic build failed." - exit 1 - fi - if [ "${INSTALL_PACKAGES}" = "YES" ]; then - installpkg ${OUTPUT}/${KERNEL_GENERIC_PACKAGE_NAME} || exit 1 - fi - - # Build kernel-modules (for the just built generic kernel, but most of them - # will also work with the huge kernel): - KERNEL_MODULES_PACKAGE_NAME=$(PRINT_PACKAGE_NAME=YES KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=$TMP/package-kernel-source/usr/src/linux/.config BUILD=$BUILD ./kernel-modules.SlackBuild) - KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=$TMP/package-kernel-source/usr/src/linux/.config BUILD=$BUILD ./kernel-modules.SlackBuild - if [ -r ${TMP}/${KERNEL_MODULES_PACKAGE_NAME} ]; then - mv ${TMP}/${KERNEL_MODULES_PACKAGE_NAME} $OUTPUT - else - echo "kernel-modules build failed." - exit 1 - fi - if [ "${INSTALL_PACKAGES}" = "YES" ]; then - installpkg ${OUTPUT}/${KERNEL_MODULES_PACKAGE_NAME} || exit 1 - fi - - # Build kernel-headers: - KERNEL_HEADERS_PACKAGE_NAME=$(PRINT_PACKAGE_NAME=YES KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux BUILD=$BUILD ./kernel-headers.SlackBuild) - KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux BUILD=$BUILD ./kernel-headers.SlackBuild - if [ -r ${TMP}/${KERNEL_HEADERS_PACKAGE_NAME} ]; then - mv ${TMP}/${KERNEL_HEADERS_PACKAGE_NAME} $OUTPUT - else - echo "kernel-headers build failed." - exit 1 - fi - if [ "${INSTALL_PACKAGES}" = "YES" ]; then - upgradepkg --reinstall --install-new ${OUTPUT}/${KERNEL_HEADERS_PACKAGE_NAME} || exit 1 - fi - - # Update initrd: - if [ "${INSTALL_PACKAGES}" = "YES" ]; then - 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 ${INITRD_VERSION}${INITRD_LOCALVERSION} - else # try this? - sh /usr/share/mkinitrd/mkinitrd_command_generator.sh -k ${INITRD_VERSION}${INITRD_LOCALVERSION} | sed "s/-c -k/-k/g" | bash - fi - fi - - echo - echo "${recipe} kernel packages done!" - echo - -done diff --git a/testing/source/linux-6.6.x/kernel-generic.SlackBuild b/testing/source/linux-6.6.x/kernel-generic.SlackBuild deleted file mode 100755 index 1f2fb66f1..000000000 --- a/testing/source/linux-6.6.x/kernel-generic.SlackBuild +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh - -# Copyright 2018, 2020 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. - -# To use this script, point it to a Linux kernel source tree and a .config -# file by setting the appropriate environment variables: -# -# KERNEL_SOURCE=/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-generic-4.14.23 ./kernel-generic.SlackBuild -# -# It can also build the huge (or any other) kernel: -# -# KERNEL_NAME=huge KERNEL_SOURCE=/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-huge-4.14.23 ./kernel-generic.SlackBuild -# -# By default, it will call the package "kernel-generic" and use the source and -# .config already in /usr/src/linux (if possible). - -cd $(dirname $0) ; CWD=$(pwd) - -KERNEL_NAME=${KERNEL_NAME:-generic} -KERNEL_SOURCE=${KERNEL_SOURCE:-/usr/src/linux} -KERNEL_CONFIG=${KERNEL_CONFIG:-/usr/src/linux/.config} -CONFIG_SUFFIX=${CONFIG_SUFFIX:-} -BUILD=${BUILD:-1} -if [ ! -r "${KERNEL_CONFIG}" ]; then - echo "Error: the KERNEL_CONFIG environment variable needs to be set to the" - echo ".config file to be used to build this kernel. Example:" - echo "KERNEL_NAME=generic KERNEL_SOURCE=/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-generic-4.14.23 ./kernel-generic.SlackBuild" - exit 1 -fi -if [ ! -d "${KERNEL_SOURCE}" ]; then - echo "Error: kernel source directory ${KERNEL_SOURCE} does not exist." - exit 1 -fi -# Get the kernel version from the kernel Makefile: -VERSION=$(grep "^VERSION = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^PATCHLEVEL = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^SUBLEVEL = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev)$(grep "^EXTRAVERSION = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev) -# Set LOCALVERSION to the value found inside the .config: -LOCALVERSION="$(cat ${KERNEL_SOURCE}/.config 2> /dev/null | grep CONFIG_LOCALVERSION= | cut -f 2 -d = | tr -d \")" -# The default kernel arch is x86 for all 32-bit and 64-bit x86: -if [ -z "${KERNEL_ARCH}" ]; then - case "$(uname -m)" in - i?86) KERNEL_ARCH=x86 ;; - x86_64) KERNEL_ARCH=x86 ;; - # Use uname -m for all other archs: - *) KERNEL_ARCH=$(uname -m) ;; - esac -fi -# If this variable is set to an output directory, we will also put copies of -# System.map.gz, bzImage, and config in there: -KERNEL_OUTPUT_DIRECTORY=${KERNEL_OUTPUT_DIRECTORY:-} - -# 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 need to copy the config and run make oldconfig and make - # prepare in order to generate kernel/bounds.s, where we can find - # the true $PACKAGE_ARCH. - if [ ! "${KERNEL_CONFIG}" = "${KERNEL_SOURCE}/.config" ]; then - cp -a ${KERNEL_CONFIG} ${KERNEL_SOURCE}/.config - fi - cd ${KERNEL_SOURCE} - make oldconfig 1> /dev/null 2> /dev/null - make prepare 1> /dev/null 2> /dev/null - PACKAGE_ARCH=$(cat kernel/bounds.s | grep -w "\-march=.*" | tr " " "\n" | grep -w "\-march=.*" | cut -f 2 -d = | tr - _) - echo "kernel-${KERNEL_NAME}${LOCALVERSION}-$(echo ${VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-${PACKAGE_ARCH}-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -TMP=${TMP:-/tmp} -PKG=$TMP/package-kernel-${KERNEL_NAME} - -rm -rf $PKG -mkdir -p $TMP $PKG - -# Set the variable $KERNEL_CLEAN to anything to run "make clean" before the -# build. Default is to start compiling in the tree as we found it. -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 - find . -name "*.cmd" -exec rm -f "{}" \+ - rm .*.d - ) -fi - -# Copy the .config into the kernel source directory (unless it's there already) -if [ ! "${KERNEL_CONFIG}" = "${KERNEL_SOURCE}/.config" ]; then - echo "Copying the .config file to the kernel source tree:" - cp -a --verbose ${KERNEL_CONFIG} ${KERNEL_SOURCE}/.config -fi - -( cd ${KERNEL_SOURCE} - echo "Running make oldconfig..." - make oldconfig - echo "Building kernel..." - make $NUMJOBS bzImage || make bzImage || exit 1 - # Output files to a directory, if requested: - if [ ! -z "${KERNEL_OUTPUT_DIRECTORY}" ]; then - echo "Copying files to ${KERNEL_OUTPUT_DIRECTORY}..." - mkdir -p ${KERNEL_OUTPUT_DIRECTORY} - rm -f ${KERNEL_OUTPUT_DIRECTORY}/* - cp -a --verbose System.map ${KERNEL_OUTPUT_DIRECTORY} - cp -a --verbose .config ${KERNEL_OUTPUT_DIRECTORY}/config - cp -a --verbose arch/${KERNEL_ARCH}/boot/bzImage ${KERNEL_OUTPUT_DIRECTORY} - gzip -9 ${KERNEL_OUTPUT_DIRECTORY}/System.map - fi - echo "Preparing the package in $PKG..." - mkdir -p $PKG/boot - cp -a --verbose System.map $PKG/boot/System.map-${KERNEL_NAME}${LOCALVERSION}-${VERSION}${LOCALVERSION} - cp -a --verbose .config $PKG/boot/config-${KERNEL_NAME}${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} - cp -a --verbose arch/${KERNEL_ARCH}/boot/bzImage $PKG/boot/vmlinuz-${KERNEL_NAME}${LOCALVERSION}-${VERSION}${LOCALVERSION} - # Make symlinks: - ln -sf System.map-${KERNEL_NAME}${LOCALVERSION}-${VERSION}${LOCALVERSION} $PKG/boot/System.map - ln -sf config-${KERNEL_NAME}${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX} $PKG/boot/config - ln -sf vmlinuz-${KERNEL_NAME}${LOCALVERSION}-${VERSION}${LOCALVERSION} $PKG/boot/vmlinuz - ln -sf vmlinuz-${KERNEL_NAME}${LOCALVERSION}-${VERSION}${LOCALVERSION} $PKG/boot/vmlinuz-${KERNEL_NAME}${LOCALVERSION} -) || exit 1 - -# Fetch the kernel architecture from the source tree: -cd ${KERNEL_SOURCE} -PACKAGE_ARCH=$(cat kernel/bounds.s | grep -w "\-march=.*" | tr " " "\n" | grep -w "\-march=.*" | cut -f 2 -d = | tr - _) - -mkdir $PKG/install -if [ -r $CWD/slack-desc/slack-desc.kernel-${KERNEL_NAME}${LOCALVERSION}.${PACKAGE_ARCH} ]; then - cat $CWD/slack-desc/slack-desc.kernel-${KERNEL_NAME}${LOCALVERSION}.${PACKAGE_ARCH} > $PKG/install/slack-desc -else - cat $CWD/slack-desc/slack-desc.kernel-template | sed "s/%PACKAGE_NAME%/kernel-${KERNEL_NAME}${LOCALVERSION}/g" > $PKG/install/slack-desc -fi - -# Make the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/kernel-${KERNEL_NAME}${LOCALVERSION}-$(echo ${VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-${PACKAGE_ARCH}-$BUILD.txz - diff --git a/testing/source/linux-6.6.x/kernel-headers.SlackBuild b/testing/source/linux-6.6.x/kernel-headers.SlackBuild deleted file mode 100755 index 2721350a1..000000000 --- a/testing/source/linux-6.6.x/kernel-headers.SlackBuild +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -# Copyright 2018 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. - -# To use this script, point it to a Linux kernel source tree, and it will make -# the kernel-headers package using the .config to get all needed package -# version information: -# -# KERNEL_SOURCE=/usr/src/linux ./kernel-headers.SlackBuild - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=${PKGNAM:-kernel-headers} -BUILD=${BUILD:-1} -KERNEL_SOURCE=${KERNEL_SOURCE:-/usr/src/linux} -if [ -z "${HEADERS_ARCH}" ]; then - case "$(uname -m)" in - i?86) HEADERS_ARCH=x86 ;; - x86_64) HEADERS_ARCH=x86 ;; - # Use uname -m for all other archs: - *) HEADERS_ARCH=$(uname -m) ;; - esac -fi -if [ ! -d "${KERNEL_SOURCE}" ]; then - echo "Error: kernel source directory ${KERNEL_SOURCE} does not exist." - exit 1 -elif [ ! -r ${KERNEL_SOURCE}/.config ]; then - echo "Error: a .config was not found in ${KERNEL_SOURCE}." - exit 1 -fi -# Get the kernel version from the kernel Makefile: -VERSION=$(grep "^VERSION = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^PATCHLEVEL = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^SUBLEVEL = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev)$(grep "^EXTRAVERSION = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev) -# Set LOCALVERSION to the value found inside the .config: -LOCALVERSION="$(cat ${KERNEL_SOURCE}/.config 2> /dev/null | grep CONFIG_LOCALVERSION= | cut -f 2 -d = | tr -d \")" - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# 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 - echo "kernel-headers-$(echo ${VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-${HEADERS_ARCH}-$BUILD.txz" - exit 0 -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -mkdir -p $PKG/usr - -# Generate the kernel headers and clean them up: -( cd ${KERNEL_SOURCE} - echo "Generating headers from the Linux kernel source tree in ${KERNEL_SOURCE}:" - make headers_install ARCH=${HEADERS_ARCH} INSTALL_HDR_PATH=$PKG/usr - cd $PKG/usr/include - # You won't want these files. The ones in libdrm work better. - rm -rf drm - # This next part seems pretty much cosmetic, but since we've been doing this - # for a long time (and others also do), we'll stick with it: - mv asm asm-${HEADERS_ARCH} - ln -sf asm-${HEADERS_ARCH} asm - # Remove unneeded dotfiles: - find . -name ".??*" -exec rm -f {} \+ -) - -mkdir -p $PKG/install -cat $CWD/slack-desc/slack-desc.kernel-headers > $PKG/install/slack-desc - -# Make the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/kernel-headers-$(echo ${VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-${HEADERS_ARCH}-$BUILD.txz - diff --git a/testing/source/linux-6.6.x/kernel-modules.SlackBuild b/testing/source/linux-6.6.x/kernel-modules.SlackBuild deleted file mode 100755 index fa3cd1639..000000000 --- a/testing/source/linux-6.6.x/kernel-modules.SlackBuild +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/sh - -# Copyright 2018, 2020, 2022 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. - -# To use this script, point it to a Linux kernel source tree and a .config -# file by setting the appropriate environment variables: -# -# KERNEL_SOURCE=/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-generic-4.14.23 ./kernel-modules.SlackBuild -# -# By default, it will use the source and .config already in /usr/src/linux (if possible). - -# KERNEL_NAME is optional, and we don't use it. Define it to "-name" if -# you'd like an extra string after "kernel" in the package name -# (i.e. "kernel-name-modules"). - -cd $(dirname $0) ; CWD=$(pwd) - -KERNEL_NAME=${KERNEL_NAME:-} -KERNEL_SOURCE=${KERNEL_SOURCE:-/usr/src/linux} -KERNEL_CONFIG=${KERNEL_CONFIG:-/usr/src/linux/.config} -BUILD=${BUILD:-1} - -# The CONFIG_DEBUG_INFO_BTF_MODULES option adds a huge amount of debugging -# data to the modules which we don't actually need. We'll strip debugging -# information from kernel modules by default. If you are building a debug -# kernel and wish to retain this data, export the variable below set to "0". -STRIP_DEBUG=${STRIP_DEBUG:-1} - -# Let's export the variable with the name needed by the kernel's Makefiles, -# just for good measure. -export INSTALL_MOD_STRIP=$STRIP_DEBUG - -if [ ! -r "${KERNEL_CONFIG}" ]; then - echo "Error: the KERNEL_CONFIG environment variable needs to be set to the" - echo ".config file to be used to build these modules. Example:" - echo "KERNEL_SOURCE=/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-generic-4.14.23 ./kernel-modules.SlackBuild" - exit 1 -fi -if [ ! -d "${KERNEL_SOURCE}" ]; then - echo "Error: kernel source directory ${KERNEL_SOURCE} does not exist." - exit 1 -fi -# Get the kernel version from the kernel Makefile: -VERSION=$(grep "^VERSION = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^PATCHLEVEL = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^SUBLEVEL = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev)$(grep "^EXTRAVERSION = " ${KERNEL_SOURCE}/Makefile | rev | cut -f 1 -d ' ' | rev) -# Set LOCALVERSION to the value found inside the .config: -LOCALVERSION="$(cat ${KERNEL_SOURCE}/.config 2> /dev/null | 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 need to copy the config and run make oldconfig and make - # prepare in order to generate kernel/bounds.s, where we can find - # the true $PACKAGE_ARCH. - if [ ! "${KERNEL_CONFIG}" = "${KERNEL_SOURCE}/.config" ]; then - cp -a ${KERNEL_CONFIG} ${KERNEL_SOURCE}/.config - fi - cd ${KERNEL_SOURCE} - make oldconfig 1> /dev/null 2> /dev/null - make prepare 1> /dev/null 2> /dev/null - PACKAGE_ARCH=$(cat kernel/bounds.s | grep -w "\-march=.*" | tr " " "\n" | grep -w "\-march=.*" | cut -f 2 -d = | tr - _) - echo "kernel${KERNEL_NAME}-modules${LOCALVERSION}-$(echo ${VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-${PACKAGE_ARCH}-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -TMP=${TMP:-/tmp} -PKG=$TMP/package-kernel${KERNEL_NAME}-modules - -rm -rf $PKG -mkdir -p $TMP $PKG - -# Set the variable $KERNEL_CLEAN to anything to run "make clean" before the -# build. Default is to start compiling in the tree as we found it. -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 - find . -name "*.cmd" -exec rm -f "{}" \+ - rm .*.d - ) -fi - -# Copy the .config into the kernel source directory (unless it's there already) -if [ ! "${KERNEL_CONFIG}" = "${KERNEL_SOURCE}/.config" ]; then - echo "Copying the .config file to the kernel source tree:" - cp -a --verbose ${KERNEL_CONFIG} ${KERNEL_SOURCE}/.config -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..." - make INSTALL_MOD_PATH=$PKG INSTALL_MOD_STRIP=$STRIP_DEBUG modules_install || exit 1 - # Fix build and source symlinks if they are pointing into $TMP: - ( cd $PKG/lib/modules/${VERSION}${LOCALVERSION} - for symlink in build source ; do - target=$(readlink $symlink) - if echo $target | grep -q "^$TMP/package-kernel-source/" ; then - rm -f $symlink - ln -sf $(echo $target | sed "s|$TMP/package-kernel-source/|/|g") $symlink - fi - done - ) - depmod -b $PKG -a ${VERSION}${LOCALVERSION} -) || exit 1 - -mkdir $PKG/install -cat $CWD/slack-desc/slack-desc.kernel-modules-template | sed "s/%PACKAGE_NAME%/kernel${KERNEL_NAME}-modules${LOCALVERSION}/g" > $PKG/install/slack-desc - -# Fetch the kernel architecture from the source tree: -cd ${KERNEL_SOURCE} -PACKAGE_ARCH=$(cat kernel/bounds.s | grep -w "\-march=.*" | tr " " "\n" | grep -w "\-march=.*" | cut -f 2 -d = | tr - _) - -# Make the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/kernel${KERNEL_NAME}-modules${LOCALVERSION}-$(echo ${VERSION} | tr - _)$(echo ${LOCALVERSION} | tr - _)-${PACKAGE_ARCH}-$BUILD.txz - diff --git a/testing/source/linux-6.6.x/kernel-source.SlackBuild b/testing/source/linux-6.6.x/kernel-source.SlackBuild deleted file mode 100755 index ad6bc282d..000000000 --- a/testing/source/linux-6.6.x/kernel-source.SlackBuild +++ /dev/null @@ -1,236 +0,0 @@ -#!/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_.*;$/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 - diff --git a/testing/source/linux-6.6.x/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch b/testing/source/linux-6.6.x/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch deleted file mode 100644 index c8767a252..000000000 --- a/testing/source/linux-6.6.x/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch +++ /dev/null @@ -1,53 +0,0 @@ -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") -Signed-off-by: Michael Kelley <mikelley@microsoft.com> -Signed-off-by: Borislav Petkov <bp@suse.de> -Acked-by: Dave Hansen <dave.hansen@linux.intel.com> -Cc: <stable@kernel.org> -Link: https://lore.kernel.org/r/1668624097-14884-2-git-send-email-mikelley@microsoft.com -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/mm/ioremap.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c -index 1ad0228f8ceb..19058d746695 100644 ---- a/arch/x86/mm/ioremap.c -+++ b/arch/x86/mm/ioremap.c -@@ -216,9 +216,15 @@ __ioremap_caller(resource_size_t phys_addr, unsigned long size, - * Mappings have to be page-aligned - */ - offset = phys_addr & ~PAGE_MASK; -- phys_addr &= PHYSICAL_PAGE_MASK; -+ phys_addr &= PAGE_MASK; - size = PAGE_ALIGN(last_addr+1) - phys_addr; - -+ /* -+ * Mask out any bits not part of the actual physical -+ * address, like memory encryption bits. -+ */ -+ phys_addr &= PHYSICAL_PAGE_MASK; -+ - retval = memtype_reserve(phys_addr, (u64)phys_addr + size, - pcm, &new_pcm); - if (retval) { --- -2.39.0 - diff --git a/testing/source/linux-6.6.x/patches-revert-i686/README b/testing/source/linux-6.6.x/patches-revert-i686/README deleted file mode 100644 index de85ec00a..000000000 --- a/testing/source/linux-6.6.x/patches-revert-i686/README +++ /dev/null @@ -1,5 +0,0 @@ -We need to revert this patch which causes boot failure with 32-bit PAE on -*some* machines, such as: LENOVO 20QV000GUS Intel i7-9850H - -Non-PAE is not affected, but we'll let this get reverted there too since -it's not part of the code path anyway. diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-generic.x86_64 b/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-generic.x86_64 deleted file mode 100644 index 85dbe6b19..000000000 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-generic.x86_64 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-generic: kernel-generic (a general purpose Linux kernel) -kernel-generic: -kernel-generic: This is a Linux kernel with built-in support for SATA, NVMe, and most -kernel-generic: commonly used filesystems. It is recommended to use an initrd with -kernel-generic: this kernel for best results. For more information about creating an -kernel-generic: initrd, see the README.initrd file in the /boot directory. -kernel-generic: -kernel-generic: -kernel-generic: -kernel-generic: -kernel-generic: diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-headers b/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-headers deleted file mode 100644 index 511d5fdc7..000000000 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-headers +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-headers: kernel-headers (Linux kernel include files) -kernel-headers: -kernel-headers: These are the include files from the Linux kernel. -kernel-headers: -kernel-headers: You'll need these to compile most system software for Linux. -kernel-headers: -kernel-headers: -kernel-headers: -kernel-headers: -kernel-headers: -kernel-headers: diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-huge.x86_64 b/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-huge.x86_64 deleted file mode 100644 index 7317c99b3..000000000 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-huge.x86_64 +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-huge: kernel-huge (generic kernel with built-in SCSI drivers) -kernel-huge: -kernel-huge: This is a Linux kernel with built-in support for most disk controllers -kernel-huge: (including RAID and SCSI) and filesystems. It is recommended to use an -kernel-huge: initrd with this kernel for best results. For more information about -kernel-huge: creating an initrd, see the README.initrd file in the /boot directory. -kernel-huge: -kernel-huge: -kernel-huge: -kernel-huge: -kernel-huge: diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-modules-template b/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-modules-template deleted file mode 100644 index 6e5bd2ddf..000000000 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-modules-template +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -%PACKAGE_NAME%: %PACKAGE_NAME% (Linux kernel modules) -%PACKAGE_NAME%: -%PACKAGE_NAME%: Kernel modules are pieces of code that can be loaded and unloaded into -%PACKAGE_NAME%: the kernel upon demand. They extend the functionality of the kernel -%PACKAGE_NAME%: without the need to reboot the system. These modules provide support -%PACKAGE_NAME%: for hardware such as USB devices, SCSI and RAID controllers, network -%PACKAGE_NAME%: interfaces, and display devices, or add other additional capabilities -%PACKAGE_NAME%: to the kernel. -%PACKAGE_NAME%: -%PACKAGE_NAME%: -%PACKAGE_NAME%: diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-source b/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-source deleted file mode 100644 index cf254e748..000000000 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-source +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-source: kernel-source (Linux kernel source) -kernel-source: -kernel-source: Source code for Linus Torvalds' Linux kernel. -kernel-source: -kernel-source: This is the complete and unmodified source code for the Linux kernel. -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-source.vanilla b/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-source.vanilla deleted file mode 100644 index cf254e748..000000000 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-source.vanilla +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kernel-source: kernel-source (Linux kernel source) -kernel-source: -kernel-source: Source code for Linus Torvalds' Linux kernel. -kernel-source: -kernel-source: This is the complete and unmodified source code for the Linux kernel. -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: -kernel-source: diff --git a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-template b/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-template deleted file mode 100644 index b12931796..000000000 --- a/testing/source/linux-6.6.x/slack-desc/slack-desc.kernel-template +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -%PACKAGE_NAME%: %PACKAGE_NAME% (a Linux kernel) -%PACKAGE_NAME%: -%PACKAGE_NAME%: This is a Linux kernel with built-in support for SATA, NVMe, and most -%PACKAGE_NAME%: commonly used filesystems. It is recommended to use an initrd with -%PACKAGE_NAME%: this kernel for best results. For more information about creating an -%PACKAGE_NAME%: initrd, see the README.initrd file in the /boot directory. -%PACKAGE_NAME%: -%PACKAGE_NAME%: -%PACKAGE_NAME%: -%PACKAGE_NAME%: -%PACKAGE_NAME%: |