[packages/geninitrd] - rel 2; virtio bus driver modules loading

[arekm]

commit a19f276b6e92ca9c2f94eb989dfc332e3827cad9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Apr 23 15:05:06 2013 +0200

    - rel 2; virtio bus driver modules loading

 geninitrd-svn.patch | 62 +++++++++++------------------------------------------
 geninitrd.spec      |  6 +++---
 2 files changed, 15 insertions(+), 53 deletions(-)
---
diff --git a/geninitrd.spec b/geninitrd.spec
index 0405231..fa0ac10 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -7,12 +7,12 @@ 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:	12639
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	bd47ea3ca6dbeea39af6bc5eb1d12e5a
-# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12639:HEAD > geninitrd-svn.patch
+# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12652:HEAD > geninitrd-svn.patch
 Patch0:		%{name}-svn.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/geninitrd
 BuildRequires:	xmlto >= 0:0.0.18-1
@@ -87,7 +87,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-#%patch0 -p0
+%patch0 -p0
 
 %build
 %{__make}
diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index 9573f3c..437419b 100644
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -1,53 +1,15 @@
 Index: geninitrd
 ===================================================================
---- geninitrd	(wersja 12585)
-+++ geninitrd	(wersja 12612)
-@@ -332,6 +332,15 @@
- 	/lib/geninitrd/extract-ikconfig /boot/vmlinuz-$kernel
- }
- 
-+# @param    $module
-+basename_module() {
-+	local module=$1
-+
-+	module=${module##*/}
-+	module=${module%$modext*}
-+	echo $module
-+}
-+
- # Finds module dependencies
- #
- # @param	$module
-@@ -366,9 +375,23 @@
- 		warn "If $module isn't compiled in kernel then this initrd may not start your system."
- 	fi
- 
-+	local smodule
-+
- 	echo "$modprobe" | \
- 	while read insmod modpath options; do
--		[ "$insmod" = "insmod" ] && echo $modpath
-+		if [ "$insmod" = "insmod" ]; then
-+
-+			# XXX: find a away to autodetect
-+			smodule=$(basename_module $modpath)
-+			case "$smodule" in
-+				libcrc32c)
-+					find_depmod "-crc32c-intel"
-+					find_depmod "-crc32c"
+--- geninitrd	(wersja 12652)
++++ geninitrd	(wersja 12653)
+@@ -388,6 +388,10 @@
+ 					find_depmod "-crc32c-intel"
+ 					find_depmod "-crc32c"
+ 					;;
++				virtio_blk|virtio_scsi)
++					find_depmod "-virtio_pci"
++					find_depmod "-virtio_mmio"
 +					;;
-+			esac
-+
-+			echo $modpath
-+		fi
- 	done
- 	return 0
- }
-@@ -1445,6 +1468,7 @@
- else
- 	initrd_gen_md
- 	initrd_gen_lvm
-+	initrd_gen_blkid
- 	initrd_gen_luks
- 	initrd_gen_setrootdev
- fi
+ 			esac
+ 
+ 			echo $modpath
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/geninitrd.git/commitdiff/a19f276b6e92ca9c2f94eb989dfc332e3827cad9