From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 12 Jan 2010 11:15:19 +0000 (+0000)
Subject: - release 10000.19
X-Git-Tag: auto/th/geninitrd-10000_19-2
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fgeninitrd.git;a=commitdiff_plain;h=c6a1771acc216bd5734497cddbe7eb7de6191a56

- release 10000.19

Changed files:
    geninitrd-lzma.patch -> 2.5
    geninitrd.spec -> 2.160
---

diff --git a/geninitrd-lzma.patch b/geninitrd-lzma.patch
deleted file mode 100644
index 6b015cb..0000000
--- a/geninitrd-lzma.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: geninitrd
-===================================================================
---- geninitrd	(wersja 10524)
-+++ geninitrd	(kopia robocza)
-@@ -47,7 +47,7 @@
- 	uname_r=$(uname -r)
- 	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|lzma|bzip2|gzip]"
- 	echo "       [--initrdfs=rom|initramfs|ext2|cram] [--modules-conf=<modules.conf>]"
- 	echo "       [--with-bootsplash] [--without-bootsplash]"
- 	echo "       [--with-fbsplash] [--without-fbsplash]"
-@@ -790,7 +790,7 @@
- find_compressor() {
- 	local mode="$1"
- 	# the best compressor list
--	local compressors='lzma bzip2 gzip'
-+	local compressors='xz lzma bzip2 gzip'
- 
- 	# a specified one, take it
- 	if ! is_yes "$mode"; then
-@@ -802,9 +802,13 @@
- 	local c prog map=/boot/System.map-$kernel
- 	for c in $compressors; do
- 		case $c in
-+		xz)
-+			sym=unxz
-+			prog=/usr/bin/xz
-+			;;
- 		lzma)
- 			sym=unlzma
--			prog=/usr/bin/lzma
-+			prog=/usr/bin/xz
- 			;;
- 		bzip2)
- 			sym=bzip2
-@@ -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
-+	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)
- 		bzip2 -9 < "$IMAGE" > "$tmp"
diff --git a/geninitrd.spec b/geninitrd.spec
index d285363..4c105e9 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,16 +1,15 @@
 Summary:	Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):	Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:		geninitrd
-Version:	10000.18
+Version:	10000.19
 # leave rel 1 for ac
-Release:	9
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	b3b0acb344ae8852cf30672370c81888
+# Source0-md5:	00b6239fe068b89f7e158523ccc55c8a
 Patch0:		%{name}-romfs.patch
 Patch1:		%{name}-gzip-compressor.patch
-Patch2:		%{name}-lzma.patch
 BuildRequires:	xmlto >= 0:0.0.18-1
 Requires:	awk
 Requires:	busybox-initrd > 1.00-4
@@ -79,10 +78,8 @@ bieżących informacji zawartych w /etc/modules.conf.
 %patch0 -p1
 %patch1 -p1
 %endif
-%patch2 -p0
 
 %build
-%{__make} clean
 %{__make}
 
 %install