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 /source/installer | |
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 'source/installer')
-rw-r--r-- | source/installer/ChangeLog.txt | 7 | ||||
-rwxr-xr-x | source/installer/build_installer.sh | 10 | ||||
-rwxr-xr-x | source/installer/installer.SlackBuild | 2 | ||||
-rwxr-xr-x | source/installer/repack_installer.SlackBuild | 6 |
4 files changed, 15 insertions, 10 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 65b3d6e5c..f6715af36 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Mon Dec 11 20:24:00 UTC 2023 + build_installer.sh: On x86, don't try to use a kernel with an -smp + LOCALVERSION as it's no longer built. The regularly-named kernels are now + the SMP/i686 versions. + repack_installer.SlackBuild: Change x86 $ARCH to i686 and drop -smp + LOCALVERSION. ++--------------------------+ Fri Dec 1 09:49:03 GMT 2023 Busybox's version of 'xzcat' creates distinct output compared to the actual 'xz' when combined with 'dd' through piping. This issue is fixed by creating diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 755ab7722..8c4588382 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -54,7 +54,7 @@ shopt -s extglob # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -127,7 +127,7 @@ case $ARCH in ADD_NANO=1 ADD_BRICKTICK=1 ;; - i586) + i686) ADD_NETMODS=1 ADD_PCMCIAMODS=1 ADD_MANPAGES=1 @@ -168,7 +168,7 @@ case $ARCH in ARCHQUADLET="-gnueabihf" ;; aarch64) SLKCFLAGS="-O2" ARCHQUADLET="" ;; - i?86) SLKCFLAGS="-O2 -march=i586 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=i686 -mtune=i686" ARCHQUADLET="" ;; s390*) SLKCFLAGS="-O2" ARCHQUADLET="" ;; @@ -198,10 +198,8 @@ case $ARCH in i?86) # What kernel directories are in this installer? KERNELS[0]=huge.s - KERNELS[1]=hugesmp.s # The -extraversion (appended to the $KVER) for the KERNELS[*]: KEXTRAV[0]="" - KEXTRAV[1]="-smp" ;; x86_64) # What kernel directories are in this installer? @@ -551,7 +549,7 @@ rm -rf $TMP/extract-packages mkdir -p -m755 $TMP/extract-packages cd $TMP/extract-packages -# Unpack the real i586/current Slackware initrd.img (or a custom one specified +# Unpack the real i686/current Slackware initrd.img (or a custom one specified # with the '-I' parameter): xzcat -f${VERBOSE1} $INITRDIMG | cpio -di${VERBOSE1} diff --git a/source/installer/installer.SlackBuild b/source/installer/installer.SlackBuild index ef6a4e6ed..64f0fb2ce 100755 --- a/source/installer/installer.SlackBuild +++ b/source/installer/installer.SlackBuild @@ -28,7 +28,7 @@ TMP=${TMP:-/tmp} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 + i?86) ARCH=i686 SLACKROOT=${SLACKROOT:-/root/slackware-current} OUTPUT=${OUTPUT:-$TMP/output-ia32-$(basename $(uname -r) -smp)} ;; diff --git a/source/installer/repack_installer.SlackBuild b/source/installer/repack_installer.SlackBuild index ecf8c5caa..e14b2993f 100755 --- a/source/installer/repack_installer.SlackBuild +++ b/source/installer/repack_installer.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2019, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -33,9 +33,9 @@ TMP=${TMP:-/tmp} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 + i?86) ARCH=i686 SLACKROOT=${SLACKROOT:-/root/slackware-current} - OUTPUT=${OUTPUT:-$TMP/output-ia32-$(basename $(uname -r) -smp)} + OUTPUT=${OUTPUT:-$TMP/output-ia32-$(basename $(uname -r))} ;; x86_64) ARCH=x86_64 SLACKROOT=${SLACKROOT:-/root/slackware64-current} |