Date: Tuesday, March 21, 2023 @ 18:57:49 Author: arojas Revision: 471699
upgpkg: plymouth-kcm 5.27.3-2: Run mkinitcpio instead of initramfs Added: plymouth-kcm/trunk/mkinitcpio.patch Modified: plymouth-kcm/trunk/PKGBUILD ------------------+ PKGBUILD | 12 +++++++++--- mkinitcpio.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-21 18:02:43 UTC (rev 471698) +++ PKGBUILD 2023-03-21 18:57:49 UTC (rev 471699) @@ -2,7 +2,7 @@ pkgname=plymouth-kcm pkgver=5.27.3 -pkgrel=1 +pkgrel=2 pkgdesc='KCM to manage the Plymouth (Boot) theme' arch=(x86_64) url='https://kde.org/plasma-desktop/' @@ -10,14 +10,20 @@ depends=(systemsettings plymouth) makedepends=(extra-cmake-modules) groups=(plasma) -source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}) +source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig} + mkinitcpio.patch) sha256sums=('8f296bdf89b79c1c39acbd64367dbc8712a5566b61fd94128208609a448ce626' - 'SKIP') + 'SKIP' + '8b0bd2731e80564827025db503c4181187eb33b7ebd0dbe9027b8e9658593683') validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan Esk-Riddell <[email protected]> '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <[email protected]> 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <[email protected]> '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <[email protected]> +prepare() { + patch -d $pkgname-$pkgver -p1 < mkinitcpio.patch # Run mkinitcpio instead of initramfs +} + build() { cmake -B build -S $pkgname-$pkgver \ -DBUILD_TESTING=OFF Added: mkinitcpio.patch =================================================================== --- mkinitcpio.patch (rev 0) +++ mkinitcpio.patch 2023-03-21 18:57:49 UTC (rev 471699) @@ -0,0 +1,34 @@ +diff --git a/src/helper.cpp b/src/helper.cpp +index b594d59..d0239cb 100644 +--- a/src/helper.cpp ++++ b/src/helper.cpp +@@ -154,12 +154,23 @@ ActionReply PlymouthHelper::save(const QVariantMap &args) + } + + QProcess process; +- qDebug() << "Running update-initramfs -u now"; +- process.start(QStringLiteral("/usr/sbin/update-initramfs"), QStringList() << QStringLiteral("-u")); +- if (!process.waitForStarted()) { +- reply = ActionReply::BackendError; +- reply.setErrorDescription(i18n("Cannot start initramfs.")); +- return reply; ++ if (QFileInfo(QStringLiteral("/usr/sbin/update-initramfs")).exists()) { ++ qDebug() << "Running update-initramfs -u now"; ++ process.start(QStringLiteral("/usr/sbin/update-initramfs"), QStringList() << QStringLiteral("-u")); ++ if (!process.waitForStarted()) { ++ reply = ActionReply::BackendError; ++ reply.setErrorDescription(i18n("Cannot start initramfs.")); ++ return reply; ++ } ++ } ++ if (QFileInfo(QStringLiteral("/usr/bin/mkinitcpio")).exists()) { ++ qDebug() << "Running mkinitcpio -P now"; ++ process.start(QStringLiteral("/usr/bin/mkinitcpio"), QStringList() << QStringLiteral("-P")); ++ if (!process.waitForStarted()) { ++ reply = ActionReply::BackendError; ++ reply.setErrorDescription(i18n("Cannot start mkinitcpio.")); ++ return reply; ++ } + } + // We don't know how long this will take. The helper will need to generate N=installed_kernels initrds. + // Be very generous with the timeout! https://bugs.kde.org/show_bug.cgi?id=400641
