mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
8d25718f1e
Happy Thanksgiving to everyone celebrating, and happy Thursday to everyone else. I've been looking at this new fontconfig (and have run into some of the terrible looking pages I remembered from previous attempts to upgrade). The solution is certainly *not* to disable bitmap fonts. I need those in my terminal emulator, and have never seen a vector font that looks correct. What I've done this time is make the defaults for fontconfig sane and user configurable, and then converted the two bitmap fonts that are causing the problems to OTB format and changing the family name from "name" to "name (OTB)" which prevents them from being picked up by default. Hope this looks better! Cheers! :-) a/file-5.46-x86_64-1.txz: Upgraded. a/mkinitrd-1.4.11-x86_64-52.txz: Rebuilt. geninitrd: since we're sourcing /etc/default/geninitrd, we might as well test the AUTO_REMOVE_ORPHANED_INITRDS variable directly instead of grepping for it in the defaults file. Thanks to Mechanikx. a/pkgtools-15.1-noarch-18.txz: Rebuilt. make-kernel-backup: account for "file" changing 80386 to i386. l/libqalculate-5.4.0.1-x86_64-1.txz: Upgraded. l/openal-soft-1.24.1-x86_64-1.txz: Upgraded. l/pipewire-1.2.7-x86_64-1.txz: Upgraded. x/font-adobe-100dpi-1.0.4-noarch-2.txz: Rebuilt. Install these fonts as OTB rather than PCF. x/font-adobe-75dpi-1.0.4-noarch-2.txz: Rebuilt. Install these fonts as OTB rather than PCF. x/fontconfig-2.15.0-x86_64-3.txz: Rebuilt. Let's not link any hinting, subpixel, or lcdfilter conf files by default. That way the user can choose what to link (if anything) without future fontconfig updates stomping on those choices. x/mesa-24.2.8-x86_64-1.txz: Upgraded.
203 lines
8 KiB
Bash
Executable file
203 lines
8 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021, 2022, 2023, 2024 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.37.0
|
|
BUILD=${BUILD:-52}
|
|
|
|
# Automatically determine the architecture we're building on:
|
|
if [ -z "$ARCH" ]; then
|
|
case "$( uname -m )" in
|
|
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 ) ;;
|
|
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 .
|
|
cat $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
|
|
cd _install
|
|
cp --remove-destination -fav * $PKG/usr/share/mkinitrd/initrd-tree
|
|
cd ..
|
|
|
|
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/etc/default
|
|
cp -a $CWD/geninitrd.default $PKG/etc/default/geninitrd.new
|
|
chown root:root $PKG/etc/default/geninitrd.new
|
|
chmod 644 $PKG/etc/default/geninitrd.new
|
|
|
|
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
|
|
cp -a $CWD/remove-orphaned-initrds $PKG/boot
|
|
chown root:root $PKG/boot/remove-orphaned-initrds
|
|
chmod 755 $PKG/boot/remove-orphaned-initrds
|
|
( cd $PKG/usr/sbin ; ln -sf /boot/remove-orphaned-initrds . )
|
|
|
|
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/doinst.sh > $PKG/install/doinst.sh
|
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
|
|
|
cd $PKG
|
|
/sbin/makepkg -l y -c n $TMP/mkinitrd-$VERSION-$ARCH-$BUILD.txz
|