mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
2dbdcbb842
We have fresh 6.6 kernels in /testing! You may notice that on the 32-bit side we have done away with the -smp labeled kernel packages, but it's actually the other kernels that were retired -- the non-SMP, non-PAE ones. If you were previously using kernel-generic-smp or kernel-huge-smp, you'll need to make some adjustments to your bootloader setup to load kernel-generic or kernel-huge instead. About the only non-obsolete CPUs that may have an issue with this are the first generation Pentium M chips, which supported PAE but unfortunately did not advertise this in the CPU flags. But these will support PAE if the kernel option "forcepae" is appended at boot time. Enjoy! :-) a/gettext-0.22.4-x86_64-1.txz: Upgraded. a/kbd-2.6.3-x86_64-3.txz: Rebuilt. Installed extra console fonts. a/kernel-firmware-20231120_9552083-noarch-1.txz: Upgraded. a/kernel-generic-6.1.63-x86_64-1.txz: Upgraded. a/kernel-huge-6.1.63-x86_64-1.txz: Upgraded. a/kernel-modules-6.1.63-x86_64-1.txz: Upgraded. a/mkinitrd-1.4.11-x86_64-34.txz: Rebuilt. Fix tests for including jfs/xfs repair tools. Thanks to regdub. a/pkgtools-15.1-noarch-8.txz: Rebuilt. Make vim the default vi choice. ap/vim-9.0.2116-x86_64-1.txz: Upgraded. d/gettext-tools-0.22.4-x86_64-1.txz: Upgraded. d/git-2.43.0-x86_64-1.txz: Upgraded. d/kernel-headers-6.1.63-x86-1.txz: Upgraded. d/mercurial-6.6-x86_64-1.txz: Upgraded. d/meson-1.3.0-x86_64-1.txz: Upgraded. d/scons-4.6.0-x86_64-1.txz: Upgraded. k/kernel-source-6.1.63-noarch-1.txz: Upgraded. l/readline-8.2.007-x86_64-1.txz: Upgraded. n/c-ares-1.22.1-x86_64-1.txz: Upgraded. n/nfs-utils-2.6.4-x86_64-1.txz: Upgraded. x/libdrm-2.4.118-x86_64-1.txz: Upgraded. xap/mozilla-firefox-115.5.0esr-x86_64-1.txz: Upgraded. This update contains security fixes and improvements. Thanks to zuriel for the taskbar icon fix on Wayland. :-) For more information, see: https://www.mozilla.org/en-US/firefox/115.5.0/releasenotes/ https://www.mozilla.org/security/advisories/mfsa2023-50/ https://www.cve.org/CVERecord?id=CVE-2023-6204 https://www.cve.org/CVERecord?id=CVE-2023-6205 https://www.cve.org/CVERecord?id=CVE-2023-6206 https://www.cve.org/CVERecord?id=CVE-2023-6207 https://www.cve.org/CVERecord?id=CVE-2023-6208 https://www.cve.org/CVERecord?id=CVE-2023-6209 https://www.cve.org/CVERecord?id=CVE-2023-6212 (* Security fix *) xap/vim-gvim-9.0.2116-x86_64-1.txz: Upgraded. xap/xsnow-3.7.6-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/kernel-generic-6.6.2-x86_64-1.txz: Added. testing/packages/kernel-headers-6.6.2-x86-1.txz: Added. testing/packages/kernel-huge-6.6.2-x86_64-1.txz: Added. testing/packages/kernel-modules-6.6.2-x86_64-1.txz: Added. testing/packages/kernel-source-6.6.2-noarch-1.txz: Added. usb-and-pxe-installers/usbboot.img: Rebuilt.
194 lines
7.6 KiB
Bash
Executable file
194 lines
7.6 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, 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=mkinitrd
|
|
VERSION=${VERSION:-1.4.11}
|
|
BB=1.32.1
|
|
BUILD=${BUILD:-34}
|
|
|
|
# Automatically determine the architecture we're building on:
|
|
if [ -z "$ARCH" ]; then
|
|
case "$( uname -m )" in
|
|
i?86) export ARCH=i586 ;;
|
|
arm*) export ARCH=arm ;;
|
|
# Unless $ARCH is already set, use uname -m for all other archs:
|
|
*) export ARCH=$( uname -m ) ;;
|
|
esac
|
|
fi
|
|
|
|
# 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
|
exit 0
|
|
fi
|
|
|
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
|
TMP=${TMP:-/tmp}
|
|
PKG=$TMP/package-mkinitrd
|
|
|
|
# Write a warning to stdout if the mkinitrd script has a different version:
|
|
eval $( grep "^MKINITRD_VERSION=" $CWD/mkinitrd )
|
|
if [ "$VERSION" != "$MKINITRD_VERSION" ]; then
|
|
echo "The version of this package ($VERSION) is not equal to the version of the mkinitrd script ($MKINITRD_VERSION)."
|
|
sleep 5
|
|
fi
|
|
|
|
rm -rf $PKG
|
|
mkdir -p $TMP $PKG
|
|
cd $TMP
|
|
rm -rf busybox-$BB
|
|
tar xvf $CWD/busybox-$BB.tar.bz2 || tar xvf $CWD/busybox-$BB.tar.?z || exit 1
|
|
cd busybox-$BB || exit 1
|
|
|
|
if [ -d $CWD/fixes-$BB ]; then
|
|
for pfile in $CWD/fixes-$BB/*.patch ; do
|
|
patch -p1 < $pfile || exit 1
|
|
done
|
|
fi
|
|
|
|
chown -R root:root .
|
|
sed -e \
|
|
's#^CONFIG_PREFIX=.*#CONFIG_PREFIX="'$PKG'/usr/share/mkinitrd/initrd-tree"#' \
|
|
$CWD/busybox-dot-config > .config
|
|
make oldconfig || exit 1
|
|
make $NUMJOBS || make || exit 1
|
|
|
|
mkdir -p $PKG/usr/share/mkinitrd/initrd-tree/{bin,sbin}
|
|
make install || exit 1
|
|
rm -f $PKG/usr/share/mkinitrd/initrd-tree/linuxrc
|
|
|
|
# Copying additional files:
|
|
cp -a $CWD/mkinitrd_command_generator.sh $PKG/usr/share/mkinitrd
|
|
chown root:root $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh
|
|
chmod 755 $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh
|
|
cp -a $CWD/keymaps.tar.gz $PKG/usr/share/mkinitrd
|
|
chown root:root $PKG/usr/share/mkinitrd/keymaps.tar.gz
|
|
chmod 644 $PKG/usr/share/mkinitrd/keymaps.tar.gz
|
|
|
|
# Zip up the initrd-tree:
|
|
( cd $PKG/usr/share/mkinitrd/initrd-tree
|
|
tar xf $CWD/_initrd-tree.tar.gz
|
|
cat $CWD/init > init
|
|
|
|
# Patch init:
|
|
zcat $CWD/0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch.gz | patch -p1 --verbose || exit 1
|
|
|
|
# These are useful for ARM:
|
|
mknod -m 644 dev/random c 1 8
|
|
mknod -m 644 dev/urandom c 1 9
|
|
|
|
tar czf ../initrd-tree.tar.gz .
|
|
) || exit 1
|
|
rm -rf $PKG/usr/share/mkinitrd/initrd-tree
|
|
|
|
# Add busybox docs:
|
|
mkdir -p $PKG/usr/doc/busybox-$BB
|
|
cp -a AUTHORS COPYING* INSTALL LICENSE README* TODO* \
|
|
$PKG/usr/doc/busybox-$BB
|
|
cp -a e2fsprogs/README $PKG/usr/doc/busybox-$BB/README.e2fsprogs
|
|
cp -a libbb/README $PKG/usr/doc/busybox-$BB/README.libbb
|
|
cp -a shell/README $PKG/usr/doc/busybox-$BB/README.shell
|
|
cp -a testsuite/README $PKG/usr/doc/busybox-$BB/README.testsuite
|
|
|
|
mkdir -p $PKG/sbin
|
|
cp -a $CWD/mkinitrd $PKG/sbin/mkinitrd
|
|
chown root:root $PKG/sbin/mkinitrd
|
|
chmod 755 $PKG/sbin/mkinitrd
|
|
|
|
# Patch to switch to mktemp:
|
|
( cd $PKG/sbin ; zcat $CWD/mkinitrd.tempfile.to.mktemp.patch.gz | patch --verbose || exit 1) || exit 1
|
|
# Patch mkinitrd to bail on no temp directory:
|
|
( cd $PKG/sbin ; zcat $CWD/0002-bail-if-temp-dir-is-not-created.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
# Don't include 40-usb_modeswitch.rules on the initrd:
|
|
( cd $PKG/sbin ; zcat $CWD/0003-blacklist.40-usb_modeswitch.rules.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
# Support modules compressed with xz:
|
|
( cd $PKG/sbin ; zcat $CWD/0005-support-modules-compressed-with-xz.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
# Ensure target directory for the module exists (cp regression workaround for coreutils-9.1):
|
|
( cd $PKG/sbin ; zcat $CWD/0006-coreutils-9.1-ensure-target-dir-exists.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
rm -f $PKG/sbin/mkinitrd.orig
|
|
# Use -R if we detect the root partition is a partition of a RAID device:
|
|
( cd $PKG/usr/share/mkinitrd ; zcat $CWD/0004-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
rm -f $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh.orig
|
|
# Fix for kmod-30:
|
|
( cd $PKG/sbin ; zcat $CWD/0007-kmod30.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
# Bugfix for previous RAID partition patch:
|
|
( cd $PKG/usr/share/mkinitrd ; zcat $CWD/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
rm -f $PKG/sbin/mkinitrd.orig
|
|
# Don't include the 99-nfs.rules on the initrd:
|
|
( cd $PKG/sbin ; zcat $CWD/0009-exclude-99-nfs.rules.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
rm -f $PKG/sbin/mkinitrd.orig
|
|
# Fix test for including JFS or XFS repair tools:
|
|
( cd $PKG/sbin ; zcat $CWD/0010-fix-test-for-jfs-xfs-repair-tools.patch.gz | patch -p1 --verbose || exit 1) || exit 1
|
|
rm -f $PKG/sbin/mkinitrd.orig
|
|
|
|
mkdir -p $PKG/usr/man/man{5,8}
|
|
cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz
|
|
cat $CWD/mkinitrd.8 | gzip -9c > $PKG/usr/man/man8/mkinitrd.8.gz
|
|
cat $CWD/mkinitrd_command_generator.8 | gzip -9c > $PKG/usr/man/man8/mkinitrd_command_generator.8.gz
|
|
|
|
mkdir -p $PKG/var/lib/pkgtools/setup
|
|
cp -a $CWD/setup.01.mkinitrd $PKG/var/lib/pkgtools/setup
|
|
chown root:root $PKG/var/lib/pkgtools/setup/setup.01.mkinitrd
|
|
chmod 755 $PKG/var/lib/pkgtools/setup/setup.01.mkinitrd
|
|
|
|
mkdir -p $PKG/usr/sbin
|
|
cp -a $CWD/geninitrd $PKG/usr/sbin
|
|
chown root:root $PKG/usr/sbin/geninitrd
|
|
chmod 755 $PKG/usr/sbin/geninitrd
|
|
|
|
mkdir -p $PKG/etc
|
|
cp -a $CWD/mkinitrd.conf.sample $PKG/etc/mkinitrd.conf.sample
|
|
# ARM systems often need more time to find devices:
|
|
case "$( uname -m )" in
|
|
arm*) sed -e 's@#WAIT="1"@#WAIT="4"@g' \
|
|
-i $PKG/etc/mkinitrd.conf.sample;;
|
|
esac
|
|
chown root:root $PKG/etc/mkinitrd.conf.sample
|
|
chmod 644 $PKG/etc/mkinitrd.conf.sample
|
|
|
|
mkdir -p $PKG/usr/doc/mkinitrd-$VERSION
|
|
sed $CWD/README.initrd \
|
|
-e "s,@DATE@,$(date),g" \
|
|
-e "s,@KERNEL_VERSION@,$(uname -r),g" \
|
|
-e "s,@PACKAGE_VERSION@,$(uname -r | tr - _),g" \
|
|
-e "s,@LILO_KERNEL_NAME@,$(echo $(uname -r) | tr -d . | tr -d - ),g" \
|
|
-e "s,@MKINITRD_VERSION@,$VERSION,g" \
|
|
-e "s,@ARCH@,$ARCH,g" \
|
|
-e "s,@BUILD@,$BUILD,g" \
|
|
> $PKG/usr/doc/mkinitrd-$VERSION/README.initrd
|
|
|
|
mkdir $PKG/boot
|
|
ln -sf /usr/doc/mkinitrd-$VERSION/README.initrd $PKG/boot/README.initrd
|
|
|
|
find $PKG | xargs file | grep -e "executable" -e "shared object" \
|
|
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
|
|
|
mkdir -p $PKG/install
|
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
|
|
|
cd $PKG
|
|
/sbin/makepkg -l y -c n $TMP/mkinitrd-$VERSION-$ARCH-$BUILD.txz
|
|
|