summaryrefslogtreecommitdiffstats
path: root/source/a/mkinitrd
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-07-09 18:50:24 +0000
committer Eric Hameleers <alien@slackware.com>2022-07-10 01:00:16 +0200
commit74dcb01dd29e48ab32ecc20d0e8e6035cfa8fe52 (patch)
treeafc2906517c06274e437d77f34538002640e2957 /source/a/mkinitrd
parent16abc79c6522d925ac606ab70bdac7f75e03dc35 (diff)
downloadcurrent-74dcb01dd29e48ab32ecc20d0e8e6035cfa8fe52.tar.gz
current-74dcb01dd29e48ab32ecc20d0e8e6035cfa8fe52.tar.xz
Sat Jul 9 18:50:24 UTC 202220220709185024
a/aaa_libraries-15.1-x86_64-5.txz: Rebuilt. Upgraded: libelf-0.187.so, libcurl.so.4.8.0, libidn.so.12.6.4, libisl.so.23.2.0, libjson-c.so.5.2.0, libltdl.so.7.3.2, libpcre2-8.so.0.11.0, libstdc++.so.6.0.30, libtdb.so.1.4.7, libtiff.so.5.8.0, libtiffxx.so.5.8.0. a/kernel-firmware-20220708_be7798e-noarch-1.txz: Upgraded. a/mkinitrd-1.4.11-x86_64-30.txz: Rebuilt. Patched for kmod-30. Thanks to teoberi. kde/attica-5.96.0-x86_64-1.txz: Upgraded. kde/baloo-5.96.0-x86_64-1.txz: Upgraded. kde/bluez-qt-5.96.0-x86_64-1.txz: Upgraded. kde/breeze-icons-5.96.0-noarch-1.txz: Upgraded. kde/extra-cmake-modules-5.96.0-x86_64-1.txz: Upgraded. kde/frameworkintegration-5.96.0-x86_64-1.txz: Upgraded. kde/kactivities-5.96.0-x86_64-1.txz: Upgraded. kde/kactivities-stats-5.96.0-x86_64-1.txz: Upgraded. kde/kapidox-5.96.0-x86_64-1.txz: Upgraded. kde/karchive-5.96.0-x86_64-1.txz: Upgraded. kde/kauth-5.96.0-x86_64-1.txz: Upgraded. kde/kbookmarks-5.96.0-x86_64-1.txz: Upgraded. kde/kcalendarcore-5.96.0-x86_64-1.txz: Upgraded. kde/kcmutils-5.96.0-x86_64-1.txz: Upgraded. kde/kcodecs-5.96.0-x86_64-1.txz: Upgraded. kde/kcompletion-5.96.0-x86_64-1.txz: Upgraded. kde/kconfig-5.96.0-x86_64-1.txz: Upgraded. kde/kconfigwidgets-5.96.0-x86_64-1.txz: Upgraded. kde/kcontacts-5.96.0-x86_64-1.txz: Upgraded. kde/kcoreaddons-5.96.0-x86_64-1.txz: Upgraded. kde/kcrash-5.96.0-x86_64-1.txz: Upgraded. kde/kdav-5.96.0-x86_64-1.txz: Upgraded. kde/kdbusaddons-5.96.0-x86_64-1.txz: Upgraded. kde/kdeclarative-5.96.0-x86_64-1.txz: Upgraded. kde/kded-5.96.0-x86_64-1.txz: Upgraded. kde/kdelibs4support-5.96.0-x86_64-1.txz: Upgraded. kde/kdesignerplugin-5.96.0-x86_64-1.txz: Upgraded. kde/kdesu-5.96.0-x86_64-1.txz: Upgraded. kde/kdewebkit-5.96.0-x86_64-1.txz: Upgraded. kde/kdnssd-5.96.0-x86_64-1.txz: Upgraded. kde/kdoctools-5.96.0-x86_64-1.txz: Upgraded. kde/kemoticons-5.96.0-x86_64-1.txz: Upgraded. kde/kfilemetadata-5.96.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.96.0-x86_64-1.txz: Upgraded. kde/kguiaddons-5.96.0-x86_64-1.txz: Upgraded. kde/kholidays-5.96.0-x86_64-1.txz: Upgraded. kde/khtml-5.96.0-x86_64-1.txz: Upgraded. kde/ki18n-5.96.0-x86_64-1.txz: Upgraded. kde/kiconthemes-5.96.0-x86_64-1.txz: Upgraded. kde/kidletime-5.96.0-x86_64-1.txz: Upgraded. kde/kimageformats-5.96.0-x86_64-1.txz: Upgraded. kde/kinit-5.96.0-x86_64-1.txz: Upgraded. kde/kio-5.96.0-x86_64-1.txz: Upgraded. kde/kirigami2-5.96.0-x86_64-1.txz: Upgraded. kde/kitemmodels-5.96.0-x86_64-1.txz: Upgraded. kde/kitemviews-5.96.0-x86_64-1.txz: Upgraded. kde/kjobwidgets-5.96.0-x86_64-1.txz: Upgraded. kde/kjs-5.96.0-x86_64-1.txz: Upgraded. kde/kjsembed-5.96.0-x86_64-1.txz: Upgraded. kde/kmediaplayer-5.96.0-x86_64-1.txz: Upgraded. kde/knewstuff-5.96.0-x86_64-1.txz: Upgraded. kde/knotifications-5.96.0-x86_64-1.txz: Upgraded. kde/knotifyconfig-5.96.0-x86_64-1.txz: Upgraded. kde/kpackage-5.96.0-x86_64-1.txz: Upgraded. kde/kparts-5.96.0-x86_64-1.txz: Upgraded. kde/kpeople-5.96.0-x86_64-1.txz: Upgraded. kde/kplotting-5.96.0-x86_64-1.txz: Upgraded. kde/kpty-5.96.0-x86_64-1.txz: Upgraded. kde/kquickcharts-5.96.0-x86_64-1.txz: Upgraded. kde/kross-5.96.0-x86_64-1.txz: Upgraded. kde/krunner-5.96.0-x86_64-1.txz: Upgraded. kde/kservice-5.96.0-x86_64-1.txz: Upgraded. kde/ktexteditor-5.96.0-x86_64-1.txz: Upgraded. kde/ktextwidgets-5.96.0-x86_64-1.txz: Upgraded. kde/kunitconversion-5.96.0-x86_64-1.txz: Upgraded. kde/kwallet-5.96.0-x86_64-1.txz: Upgraded. kde/kwayland-5.96.0-x86_64-1.txz: Upgraded. kde/kwidgetsaddons-5.96.0-x86_64-1.txz: Upgraded. kde/kwindowsystem-5.96.0-x86_64-1.txz: Upgraded. kde/kxmlgui-5.96.0-x86_64-1.txz: Upgraded. kde/kxmlrpcclient-5.96.0-x86_64-1.txz: Upgraded. kde/modemmanager-qt-5.96.0-x86_64-1.txz: Upgraded. kde/networkmanager-qt-5.96.0-x86_64-1.txz: Upgraded. kde/oxygen-icons5-5.96.0-noarch-1.txz: Upgraded. kde/plasma-framework-5.96.0-x86_64-1.txz: Upgraded. kde/prison-5.96.0-x86_64-1.txz: Upgraded. kde/purpose-5.96.0-x86_64-1.txz: Upgraded. kde/qqc2-desktop-style-5.96.0-x86_64-1.txz: Upgraded. kde/solid-5.96.0-x86_64-1.txz: Upgraded. kde/sonnet-5.96.0-x86_64-1.txz: Upgraded. kde/syndication-5.96.0-x86_64-1.txz: Upgraded. kde/syntax-highlighting-5.96.0-x86_64-1.txz: Upgraded. kde/threadweaver-5.96.0-x86_64-1.txz: Upgraded. l/SDL2_image-2.6.0-x86_64-1.txz: Upgraded. l/SDL2_mixer-2.6.0-x86_64-1.txz: Upgraded. l/alsa-lib-1.2.7.2-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_41-x86_64-1.txz: Upgraded. l/nodejs-16.16.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/mkinitrd')
-rw-r--r--source/a/mkinitrd/0007-kmod30.patch14
-rwxr-xr-xsource/a/mkinitrd/mkinitrd.SlackBuild7
2 files changed, 19 insertions, 2 deletions
diff --git a/source/a/mkinitrd/0007-kmod30.patch b/source/a/mkinitrd/0007-kmod30.patch
new file mode 100644
index 000000000..484f8c91e
--- /dev/null
+++ b/source/a/mkinitrd/0007-kmod30.patch
@@ -0,0 +1,14 @@
+--- ./mkinitrd.orig 2022-07-09 12:56:10.493030210 -0500
++++ ./mkinitrd 2022-07-09 12:57:38.848032187 -0500
+@@ -702,9 +702,9 @@
+ cp -a /sbin/$i $SOURCE_TREE/sbin ;
+ done
+
+-# Make sure modules.builtin and modules.order are there (for kmod):
++# Make sure modules.builtin, modules.builtin.modinfo, and modules.order are there (for kmod):
+ for kver in $(echo ${KERNEL_VERSION} | tr ':' '\n') ; do
+- cp /lib/modules/$kver/modules.{builtin,order} \
++ cp /lib/modules/$kver/modules.{builtin,builtin.modinfo,order} \
+ $SOURCE_TREE/lib/modules/$kver
+ done
+
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 456e4481a..d23adbc95 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 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021, 2022 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:-29}
+BUILD=${BUILD:-30}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -132,6 +132,9 @@ 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
+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