diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-02-28 21:33:32 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-02-28 23:45:27 +0100 |
commit | c3f9dd63fd78db827732d61713e01c0540992d25 (patch) | |
tree | 5836e4d41df1382c0dee7743e70734d4e29001ce /source/a | |
parent | 750befe72ff6633b0448d104634f085e8a0dbcef (diff) | |
download | current-c3f9dd63fd78db827732d61713e01c0540992d25.tar.gz current-c3f9dd63fd78db827732d61713e01c0540992d25.tar.xz |
Tue Feb 28 21:33:32 UTC 202320230228213332
a/mkinitrd-1.4.11-x86_64-31.txz: Rebuilt.
Fix the check to ensure -R is added when the root partition is a partition of
a RAID device.
Thanks to perrin4869 and drumz.
ap/vim-9.0.1362-x86_64-1.txz: Upgraded.
kde/bluedevil-5.27.2-x86_64-1.txz: Upgraded.
kde/breeze-5.27.2-x86_64-1.txz: Upgraded.
kde/breeze-grub-5.27.2-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.27.2-x86_64-1.txz: Upgraded.
kde/drkonqi-5.27.2-x86_64-1.txz: Upgraded.
kde/kactivitymanagerd-5.27.2-x86_64-1.txz: Upgraded.
kde/kde-cli-tools-5.27.2-x86_64-1.txz: Upgraded.
kde/kde-gtk-config-5.27.2-x86_64-1.txz: Upgraded.
kde/kdecoration-5.27.2-x86_64-1.txz: Upgraded.
kde/kdeplasma-addons-5.27.2-x86_64-1.txz: Upgraded.
kde/kgamma5-5.27.2-x86_64-1.txz: Upgraded.
kde/khotkeys-5.27.2-x86_64-1.txz: Upgraded.
kde/kinfocenter-5.27.2-x86_64-1.txz: Upgraded.
kde/kmenuedit-5.27.2-x86_64-1.txz: Upgraded.
kde/kpipewire-5.27.2-x86_64-1.txz: Upgraded.
kde/kscreen-5.27.2-x86_64-1.txz: Upgraded.
kde/kscreenlocker-5.27.2-x86_64-1.txz: Upgraded.
kde/ksshaskpass-5.27.2-x86_64-1.txz: Upgraded.
kde/ksystemstats-5.27.2-x86_64-1.txz: Upgraded.
kde/kwallet-pam-5.27.2-x86_64-1.txz: Upgraded.
kde/kwayland-integration-5.27.2-x86_64-1.txz: Upgraded.
kde/kwin-5.27.2-x86_64-1.txz: Upgraded.
kde/kwrited-5.27.2-x86_64-1.txz: Upgraded.
kde/layer-shell-qt-5.27.2-x86_64-1.txz: Upgraded.
kde/libkscreen-5.27.2-x86_64-1.txz: Upgraded.
kde/libksysguard-5.27.2-x86_64-1.txz: Upgraded.
kde/milou-5.27.2-x86_64-1.txz: Upgraded.
kde/oxygen-5.27.2-x86_64-1.txz: Upgraded.
kde/oxygen-sounds-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-browser-integration-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-desktop-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-disks-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-firewall-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-integration-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-nm-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-pa-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-sdk-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-systemmonitor-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-vault-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.27.2-x86_64-1.txz: Upgraded.
kde/plasma-workspace-wallpapers-5.27.2-x86_64-1.txz: Upgraded.
kde/polkit-kde-agent-1-5.27.2-x86_64-1.txz: Upgraded.
kde/powerdevil-5.27.2-x86_64-1.txz: Upgraded.
kde/qqc2-breeze-style-5.27.2-x86_64-1.txz: Upgraded.
kde/sddm-kcm-5.27.2-x86_64-1.txz: Upgraded.
kde/systemsettings-5.27.2-x86_64-1.txz: Upgraded.
kde/xdg-desktop-portal-kde-5.27.2-x86_64-1.txz: Upgraded.
l/iso-codes-4.13.0-noarch-1.txz: Upgraded.
n/whois-5.5.16-x86_64-1.txz: Upgraded.
Add bash completion support, courtesy of Ville Skytta.
Updated the .tr TLD server.
Removed support for -metu NIC handles.
x/encodings-1.0.7-noarch-1.txz: Upgraded.
x/font-adobe-100dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-adobe-75dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-adobe-utopia-100dpi-1.0.5-noarch-1.txz: Upgraded.
x/font-adobe-utopia-75dpi-1.0.5-noarch-1.txz: Upgraded.
x/font-adobe-utopia-type1-1.0.5-noarch-1.txz: Upgraded.
x/font-alias-1.0.5-noarch-1.txz: Upgraded.
x/font-arabic-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-bh-100dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-bh-75dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-bh-lucidatypewriter-100dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-bh-lucidatypewriter-75dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-bh-ttf-1.0.4-noarch-1.txz: Upgraded.
x/font-bh-type1-1.0.4-noarch-1.txz: Upgraded.
x/font-bitstream-100dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-bitstream-75dpi-1.0.4-noarch-1.txz: Upgraded.
x/font-bitstream-type1-1.0.4-noarch-1.txz: Upgraded.
x/font-cronyx-cyrillic-1.0.4-noarch-1.txz: Upgraded.
x/font-cursor-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-daewoo-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-dec-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-ibm-type1-1.0.4-noarch-1.txz: Upgraded.
x/font-isas-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-jis-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-micro-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-misc-cyrillic-1.0.4-noarch-1.txz: Upgraded.
x/font-misc-ethiopic-1.0.5-noarch-1.txz: Upgraded.
x/font-misc-meltho-1.0.4-noarch-1.txz: Upgraded.
x/font-misc-misc-1.1.3-noarch-1.txz: Upgraded.
x/font-mutt-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-schumacher-misc-1.1.3-noarch-1.txz: Upgraded.
x/font-screen-cyrillic-1.0.5-noarch-1.txz: Upgraded.
x/font-sony-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-sun-misc-1.0.4-noarch-1.txz: Upgraded.
x/font-winitzki-cyrillic-1.0.4-noarch-1.txz: Upgraded.
x/font-xfree86-type1-1.0.5-noarch-1.txz: Upgraded.
xap/mozilla-firefox-110.0.1-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/firefox/110.0.1/releasenotes/
xap/vim-gvim-9.0.1362-x86_64-1.txz: Upgraded.
xfce/xfce4-notifyd-0.8.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
-rw-r--r-- | source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch | 23 | ||||
-rwxr-xr-x | source/a/mkinitrd/mkinitrd.SlackBuild | 6 |
2 files changed, 27 insertions, 2 deletions
diff --git a/source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch b/source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch new file mode 100644 index 000000000..1f2382895 --- /dev/null +++ b/source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch @@ -0,0 +1,23 @@ +--- ./mkinitrd_command_generator.sh.orig 2023-02-28 15:19:08.085991698 -0600 ++++ ./mkinitrd_command_generator.sh 2023-02-28 15:22:03.264982008 -0600 +@@ -308,11 +308,15 @@ + USING_RAID=1 + break + fi +- done +- # Additional check in case $BASEDEV is a partition of /dev/$MD: +- for BLK in $(sfdisk -ld /dev/$MD 2> /dev/null | grep "^/dev" | cut -d " " -f 1); do +- if [ "$BASEDEV" = "$BLK" ]; then +- USING_RAID=1 ++ # Additional check in case $BASEDEV is a partition of /dev/$MD: ++ for BLK in $(sfdisk -ld /dev/$MD 2> /dev/null | grep "^/dev" | cut -d " " -f 1); do ++ if [ "$BASEDEV" = "$BLK" ]; then ++ USING_RAID=1 ++ break ++ fi ++ done ++ # Break out of outer loop if needed. ++ if [ "$USING_RAID" = "1" ]; then + break + fi + done diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index d23adbc95..4042d355c 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# 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 @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} BB=1.32.1 -BUILD=${BUILD:-30} +BUILD=${BUILD:-31} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -134,6 +134,8 @@ rm -f $PKG/sbin/mkinitrd.orig 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 mkdir -p $PKG/usr/man/man{5,8} |