mirror of
git://slackware.nl/current.git
synced 2025-01-30 08:38:10 +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.
174 lines
8 KiB
Bash
Executable file
174 lines
8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
# Copyright 2018, 2021, 2022, 2023, 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.
|
|
|
|
# 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:
|
|
export CONFIG_SUFFIX=".ia32"
|
|
#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-${VERSION}${LOCALVERSION}-generic${CONFIG_SUFFIX}" VERSION=$VERSION BUILD=$BUILD ./kernel-source.SlackBuild)
|
|
KERNEL_CONFIG="config-${VERSION}${LOCALVERSION}-generic${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-${VERSION}${LOCALVERSION}-huge${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/huge.s BUILD=$BUILD ./kernel-generic.SlackBuild)
|
|
KERNEL_NAME=huge KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-${VERSION}${LOCALVERSION}-huge${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/huge.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-${VERSION}${LOCALVERSION}-generic${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/generic.s BUILD=$BUILD ./kernel-generic.SlackBuild)
|
|
KERNEL_NAME=generic KERNEL_SOURCE=$TMP/package-kernel-source/usr/src/linux KERNEL_CONFIG=./kernel-configs/config-${VERSION}${LOCALVERSION}-generic${CONFIG_SUFFIX} CONFIG_SUFFIX=${CONFIG_SUFFIX} KERNEL_OUTPUT_DIRECTORY=$OUTPUT/kernels/generic.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} -a "-o /boot/initrd-${INITRD_VERSION}${INITRD_LOCALVERSION}-generic.img" | sed "s/-c -k/-k/g" | bash
|
|
if [ -r /boot/initrd-${INITRD_VERSION}${INITRD_LOCALVERSION}-generic.img ]; then
|
|
# Good old compat symlink :-)
|
|
ln -sf initrd-${INITRD_VERSION}${INITRD_LOCALVERSION}-generic.img /boot/initrd.gz
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
echo
|
|
echo "${recipe} kernel packages done!"
|
|
echo
|
|
|
|
done
|