packages: geninitrd/geninitrd-lzma.patch, geninitrd/geninitrd.spec - rel 6; ...

[arekm]

Author: arekm                        Date: Fri Sep  4 13:10:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; xz and lzma formats support

---- Files affected:
packages/geninitrd:
   geninitrd-lzma.patch (2.3 -> 2.4) , geninitrd.spec (2.152 -> 2.153) 

---- Diffs:

================================================================
Index: packages/geninitrd/geninitrd-lzma.patch
diff -u packages/geninitrd/geninitrd-lzma.patch:2.3 packages/geninitrd/geninitrd-lzma.patch:2.4
--- packages/geninitrd/geninitrd-lzma.patch:2.3	Fri Sep  4 14:38:45 2009
+++ packages/geninitrd/geninitrd-lzma.patch	Fri Sep  4 15:09:59 2009
@@ -7,7 +7,7 @@
  	echo "usage: $PROGRAM [--version] [-v] [-f] [--ifneeded] [--preload <module>]"
  	echo "       [--with=<module>] [--image-version] [--fstab=<fstab>] [--nocompress]"
 -	echo "       [--compress=yes|lzma|bzip2|gzip]"
-+	echo "       [--compress=yes|xz|bzip2|gzip]"
++	echo "       [--compress=yes|xz|lzma|bzip2|gzip]"
  	echo "       [--initrdfs=rom|initramfs|ext2|cram] [--modules-conf=<modules.conf>]"
  	echo "       [--with-bootsplash] [--without-bootsplash]"
  	echo "       [--with-fbsplash] [--without-fbsplash]"
@@ -16,29 +16,35 @@
  	local mode="$1"
  	# the best compressor list
 -	local compressors='lzma bzip2 gzip'
-+	local compressors='xz bzip2 gzip'
++	local compressors='xz lzma bzip2 gzip'
  
  	# a specified one, take it
  	if ! is_yes "$mode"; then
-@@ -802,9 +802,9 @@
+@@ -802,9 +802,13 @@
  	local c prog map=/boot/System.map-$kernel
  	for c in $compressors; do
  		case $c in
--		lzma)
 +		xz)
++			sym=unxz
++			prog=/usr/bin/xz
++			;;
+ 		lzma)
  			sym=unlzma
 -			prog=/usr/bin/lzma
 +			prog=/usr/bin/xz
  			;;
  		bzip2)
  			sym=bzip2
-@@ -1327,8 +1327,8 @@
+@@ -1327,8 +1331,12 @@
  	# TODO: the image name (specified from kernel.spec) already contains
  	# extension, which is .gz most of the time.
  	case "$compressor" in
--	lzma)
--		lzma -9 < "$IMAGE" > "$tmp"
 +	xz)
++		# don't use -9 here since kernel won't understand it
++		xz --format=xz --check=crc32 --lzma2=preset=6e,dict=1MiB < "$IMAGE" > "$tmp"
++		;;
+ 	lzma)
+-		lzma -9 < "$IMAGE" > "$tmp"
 +		xz --format=lzma -9 < "$IMAGE" > "$tmp"
  		;;
  	bzip2)

================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.152 packages/geninitrd/geninitrd.spec:2.153
--- packages/geninitrd/geninitrd.spec:2.152	Fri Sep  4 14:38:45 2009
+++ packages/geninitrd/geninitrd.spec	Fri Sep  4 15:09:59 2009
@@ -4,7 +4,7 @@
 Name:		geninitrd
 Version:	10000.18
 # leave rel 1 for ac
-Release:	5
+Release:	6
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
@@ -104,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 2.153  2009/09/04 13:09:59  arekm
+- rel 6; xz and lzma formats support
+
 Revision 2.152  2009/09/04 12:38:45  arekm
 - rel 5; use lzma format for xz
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd-lzma.patch?r1=2.3&r2=2.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.152&r2=2.153&f=u