[packages/dracut] - updated plymouth sed call
qboosh
qboosh at pld-linux.org
Sun Apr 15 21:04:44 CEST 2018
commit 298cda74f2587170dba76f7bacc38de5e0bca0f4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 15 21:04:55 2018 +0200
- updated plymouth sed call
dracut.spec | 4 ++--
plymouth-libdir.patch | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/dracut.spec b/dracut.spec
index f81b6d8..a8ca6d4 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -199,7 +199,7 @@ Bashowe dopełnianie składni dla polecenia dracut.
%patch4 -p1
%patch5 -p1
-%{__sed} -i -e 's, at lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
+%{__sed} -i -e 's, at libexecdir@,%{_libexecdir},g' modules.d/50plymouth/module-setup.sh
%{__sed} -i -e 's, at lib@,%{_lib},g' modules.d/95resume/module-setup.sh
find modules.d -name '*.orig' | xargs -r %{__rm}
@@ -225,7 +225,7 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
-echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
+echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT%{dracutlibdir}/dracut-version.sh
# create compat symlink
ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
diff --git a/plymouth-libdir.patch b/plymouth-libdir.patch
index b402c21..3b120f1 100644
--- a/plymouth-libdir.patch
+++ b/plymouth-libdir.patch
@@ -5,7 +5,7 @@
pkglib_dir() {
- local _dirs="/usr/lib/plymouth /usr/libexec/plymouth/"
-+ local _dirs="/usr/libexec/plymouth/"
++ local _dirs="@libexecdir@/plymouth/"
if type -P dpkg-architecture &>/dev/null; then
_dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/298cda74f2587170dba76f7bacc38de5e0bca0f4
More information about the pld-cvs-commit
mailing list