Author: glen Date: Thu Mar 22 22:37:10 2012 GMT Module: packages Tag: HEAD ---- Log message: - fix plymouth libexec path
---- Files affected: packages/dracut: dracut.spec (1.12 -> 1.13) , plymouth-libexec.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/dracut/dracut.spec diff -u packages/dracut/dracut.spec:1.12 packages/dracut/dracut.spec:1.13 --- packages/dracut/dracut.spec:1.12 Thu Mar 22 23:19:40 2012 +++ packages/dracut/dracut.spec Thu Mar 22 23:37:05 2012 @@ -2,7 +2,7 @@ Summary: Initramfs generator using udev Name: dracut Version: 017 -Release: 2 +Release: 3 License: GPL v2+ Group: Base Source0: ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz @@ -11,6 +11,7 @@ Patch0: no-rh.patch Patch1: create-target-dir-for-symlink.patch Patch2: bash-sh.patch +Patch3: plymouth-libexec.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: docbook-dtd45-xml BuildRequires: docbook-style-xsl @@ -130,6 +131,9 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 + +%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh %build %{__make} @@ -335,6 +339,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2012/03/22 22:37:05 glen +- fix plymouth libexec path + Revision 1.12 2012/03/22 22:19:40 baggins - R just plain cryptsetup ================================================================ Index: packages/dracut/plymouth-libexec.patch diff -u /dev/null packages/dracut/plymouth-libexec.patch:1.1 --- /dev/null Thu Mar 22 23:37:10 2012 +++ packages/dracut/plymouth-libexec.patch Thu Mar 22 23:37:05 2012 @@ -0,0 +1,20 @@ +--- dracut-017/modules.d/./50plymouth/module-setup.sh~ 2012-03-23 00:34:27.000000000 +0200 ++++ dracut-017/modules.d/./50plymouth/module-setup.sh 2012-03-23 00:34:29.115606192 +0200 +@@ -35,13 +35,13 @@ + } + + install() { +- if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \ +- || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/libexec/plymouth/plymouth-populate-initrd \ +- || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then ++ if grep -q nash /usr/@lib@/plymouth/plymouth-populate-initrd \ ++ || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/@lib@/plymouth/plymouth-populate-initrd \ ++ || [ ! -x /usr/@lib@/plymouth/plymouth-populate-initrd ]; then + . "$moddir"/plymouth-populate-initrd.sh + else + PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \ +- /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir ++ /usr/@lib@/plymouth/plymouth-populate-initrd -t $initdir + fi + + inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/dracut/dracut.spec?r1=1.12&r2=1.13 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
