packages: geninitrd/geninitrd.spec, geninitrd/geninitrd-tuxonice_on_dm.patc...

evil evil at pld-linux.org
Mon Mar 29 22:23:26 CEST 2010


Author: evil                         Date: Mon Mar 29 20:23:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adapterized
- added geninitrd-tuxonice_on_dm.patch, moving tuxonice script down in hierarchy, to allow tuxonice snapshot device be device mapper device(LUKS, LVM, dmraid)

---- Files affected:
packages/geninitrd:
   geninitrd.spec (2.166 -> 2.167) , geninitrd-tuxonice_on_dm.patch (NONE -> 2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.166 packages/geninitrd/geninitrd.spec:2.167
--- packages/geninitrd/geninitrd.spec:2.166	Mon Mar  8 12:01:20 2010
+++ packages/geninitrd/geninitrd.spec	Mon Mar 29 22:23:20 2010
@@ -4,7 +4,7 @@
 Name:		geninitrd
 Version:	10000.20
 # leave rel 1 for ac
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch0:		%{name}-romfs.patch
 Patch1:		%{name}-gzip-compressor.patch
 Patch2:		%{name}-scsi_sync_scan.patch
+Patch3:		%{name}-tuxonice_on_dm.patch
 BuildRequires:	xmlto >= 0:0.0.18-1
 Requires:	/usr/bin/ldd
 Requires:	awk
@@ -34,8 +35,8 @@
 # otherwise LVM subsystem is automatically disabled in geninitrd
 Suggests:	lvm2-initrd
 # without this softraid installations of PLD fail
-Suggests:	mdadm-initrd >= 1.12.0-1
 Suggests:	mdadm >= 1.12.0-1
+Suggests:	mdadm-initrd >= 1.12.0-1
 %endif
 Obsoletes:	mkinitrd
 %if "%{pld_release}" == "ac"
@@ -86,6 +87,7 @@
 %patch1 -p1
 %endif
 %patch2 -p0
+%patch3 -p1
 
 %build
 %{__make}
@@ -116,6 +118,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 2.167  2010/03/29 20:23:20  evil
+- adapterized
+- added geninitrd-tuxonice_on_dm.patch, moving tuxonice script down in hierarchy, to allow tuxonice snapshot device be device mapper device(LUKS, LVM, dmraid)
+
 Revision 2.166  2010/03/08 11:01:20  arekm
 - rel 3; sync scsi scanning for >= 2.6.30
 

================================================================
Index: packages/geninitrd/geninitrd-tuxonice_on_dm.patch
diff -u /dev/null packages/geninitrd/geninitrd-tuxonice_on_dm.patch:2.1
--- /dev/null	Mon Mar 29 22:23:26 2010
+++ packages/geninitrd/geninitrd-tuxonice_on_dm.patch	Mon Mar 29 22:23:20 2010
@@ -0,0 +1,24 @@
+--- geninitrd-10000.20/geninitrd.old	2010-03-29 22:12:27.115199528 +0200
++++ geninitrd-10000.20/geninitrd	2010-03-29 22:14:49.765210074 +0200
+@@ -1218,10 +1218,6 @@
+ 	initrd_gen_udev
+ fi
+ 
+-if is_yes "$USE_TUXONICE"; then
+-	initrd_gen_tuxonice
+-fi
+-
+ find_modules_uvesafb
+ initrd_gen_uvesafb
+ 
+@@ -1256,6 +1252,10 @@
+ 	initrd_gen_setrootdev
+ fi
+ 
++if is_yes "$USE_TUXONICE"; then
++	initrd_gen_tuxonice
++fi
++
+ if is_yes "$USE_SUSPEND"; then
+ 	initrd_gen_suspend
+ fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.166&r2=2.167&f=u



More information about the pld-cvs-commit mailing list