[packages/dracut] - plymounth stuff is in libexec now - rel 3
baggins
baggins at pld-linux.org
Fri Dec 29 17:44:45 CET 2017
commit fd5105089d1d6a5f36656045c22f6b2594765b3c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Dec 29 17:43:03 2017 +0100
- plymounth stuff is in libexec now
- rel 3
dracut.spec | 4 ++--
plymouth-libexec.patch => plymouth-libdir.patch | 7 +------
2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/dracut.spec b/dracut.spec
index d1397c8..421a5b7 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,13 +2,13 @@ Summary: Initramfs generator using udev
Summary(pl.UTF-8): Generator initramfs wykorzystujący udev
Name: dracut
Version: 046
-Release: 2
+Release: 3
License: GPL v2+
Group: Base
Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
# Source0-md5: 224b67e9bc079e013541a74e85659188
Source1: pld.conf
-Patch1: plymouth-libexec.patch
+Patch1: plymouth-libdir.patch
Patch2: os-release.patch
Patch3: plymouth-logo.patch
Patch4: arch-libdir.patch
diff --git a/plymouth-libexec.patch b/plymouth-libdir.patch
similarity index 61%
rename from plymouth-libexec.patch
rename to plymouth-libdir.patch
index 24c4bf8..dbec4ac 100644
--- a/plymouth-libexec.patch
+++ b/plymouth-libdir.patch
@@ -1,7 +1,7 @@
diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/modules.d/50plymouth/module-setup.sh
--- dracut-040.orig/modules.d/50plymouth/module-setup.sh 2014-10-24 17:41:12.966283303 +0200
+++ dracut-040/modules.d/50plymouth/module-setup.sh 2014-10-24 17:42:58.112954942 +0200
-@@ -13,11 +13,11 @@
+@@ -13,7 +13,7 @@
# called by dracut
install() {
@@ -10,8 +10,3 @@ diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/module
if type -P dpkg-architecture &>/dev/null; then
PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
fi
-- [ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth"
-+ [ -x /usr/@lib@/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/@lib@/plymouth"
-
- if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
- || [ ! -x ${PKGLIBDIR}/plymouth-populate-initrd ]; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/719f673ff328094c5afbe19e887950b4e51f23a3
More information about the pld-cvs-commit
mailing list