mirror of
git://slackware.nl/current.git
synced 2025-01-29 08:36:40 +01:00
b75837013c
Well folks, we have some more interesting stuff in /testing now. Our good friend LuckyCyborg posted a while back about our trials with GRUB2, and that we were banging our heads against a wall for no reason trying to bend GRUB2 with our 09_slackware_linux grub.d script instead of changing our kernel/initrd naming scheme to vmlinux-6.10.1-generic and initrd-6.10.1-generic.img. And, as is often the case, our friend is exactly correct. Once we stopped trying to swim against the current, GRUB2 started behaving as it should. The updates in /testing change the kernel naming scheme thusly, and modify the geninitrd script in the mkinitrd package to also use this naming scheme. And, of course, 09_slackware_linux is removed from GRUB2, and the 10_linux script is only lightly modified. Because lilo and elilo work with the symlinks to the kernel and initrd, they shouldn't care anout this change. We've probably got 6.9.11 coming tomorrow. Unless I hear that I should stop the presses on this change, it's likely that those kernels will be updated using the new naming scheme and the mkinitrd and grub updates will be moved into the main tree from /testing. We'll stick with 6.9 in the main tree for now because I'm still encountering suspend failure with the 6.10 kernel here. Enjoy! :-) a/kernel-firmware-20240723_b37d247-noarch-1.txz: Upgraded. ap/mpg123-1.32.6-x86_64-2.txz: Rebuilt. l/libxml2-2.13.3-x86_64-1.txz: Upgraded. This update fixes a security issue: Fix XXE protection in downstream code. For more information, see: https://www.cve.org/CVERecord?id=CVE-2024-40896 (* Security fix *) l/mozilla-nss-3.102.1-x86_64-1.txz: Upgraded. l/nodejs-20.16.0-x86_64-1.txz: Upgraded. l/python-importlib_metadata-8.2.0-x86_64-1.txz: Upgraded. l/v4l-utils-1.28.1-x86_64-1.txz: Upgraded. n/c-ares-1.32.3-x86_64-1.txz: Upgraded. n/curl-8.9.0-x86_64-1.txz: Upgraded. n/htdig-3.2.0b6-x86_64-10.txz: Rebuilt. Patch XSS vulnerability. Thanks to jayjwa. Get this out of cgi-bin. Thanks to LuckyCyborg. For more information, see: https://www.cve.org/CVERecord?id=CVE-2007-6110 (* Security fix *) n/libtirpc-1.3.5-x86_64-1.txz: Upgraded. extra/fltk/fltk-1.3.9-x86_64-2.txz: Rebuilt. extra/tigervnc/tigervnc-1.13.1-x86_64-6.txz: Rebuilt. Not sure why 1.14.0 isn't compiling, but we'll rebuild this for now. testing/packages/grub-2.12-x86_64-12.txz: Upgraded. Remove 09_slackware_linux. 10_linux: don't rename Slackware ;-) This should configure the renamed kernel/initrd perfectly. Perhaps 10_linux should no longer accept initrd.gz as a valid name? For now it is accepted to avoid disrupting existing workflows. testing/packages/kernel-generic-6.10.1-x86_64-1.txz: Upgraded. testing/packages/kernel-headers-6.10.1-x86-1.txz: Upgraded. testing/packages/kernel-huge-6.10.1-x86_64-1.txz: Upgraded. testing/packages/kernel-modules-6.10.1-x86_64-1.txz: Upgraded. testing/packages/kernel-source-6.10.1-noarch-1.txz: Upgraded. testing/packages/mkinitrd-1.4.11-x86_64-35.txz: Upgraded. geninitrd: create initrd with initrd-version-name.img filename. Make compat symlinks by default. Always add LVM (I've seen it mistakenly skipped... if we can get to the bottom of that then we'll stop always adding it) Add /etc/default/geninitrd for configuration.
145 lines
6.4 KiB
Bash
Executable file
145 lines
6.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
# Copyright 2018, 2020, 2022, 2024 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-6.9.9-generic.x64 ./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-6.9.9-generic.x64 ./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
|