packages: geninitrd/geninitrd-svn.patch, geninitrd/geninitrd.spec - rel 4; ...

[arekm]

Author: arekm                        Date: Sun Mar  6 16:15:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix mod-sata finding too much bug

---- Files affected:
packages/geninitrd:
   geninitrd-svn.patch (2.2 -> 2.3) , geninitrd.spec (2.178 -> 2.179) 

---- Diffs:

================================================================
Index: packages/geninitrd/geninitrd-svn.patch
diff -u packages/geninitrd/geninitrd-svn.patch:2.2 packages/geninitrd/geninitrd-svn.patch:2.3
--- packages/geninitrd/geninitrd-svn.patch:2.2	Fri Mar  4 10:24:56 2011
+++ packages/geninitrd/geninitrd-svn.patch	Sun Mar  6 17:15:17 2011
@@ -27,3 +27,30 @@
  			fi
  			if [ -n "$rootnr" ]; then
  				echo "$rootnr" > /proc/sys/kernel/real-root-dev
+Index: mod-sata.sh
+===================================================================
+--- mod-sata.sh	(wersja 12194)
++++ mod-sata.sh	(kopia robocza)
+@@ -17,7 +17,7 @@
+ 
+ # private until only mod-sata uses the function
+ find_modules_by_class() {
+-	local class=$1
++	local req_class=$1
+ 
+ 	# no pcimap, nothing to lookup from
+ 	if [ ! -f "$pcimap" ]; then
+@@ -28,10 +28,12 @@
+ 		return
+ 	fi
+ 
+-	set -- $($lspci -n | awk -vclass=$class '$2 == class":" {split($3, p, ":"); printf("0x0000%s 0x0000%s\n", p[1], p[2])}')
++	set -- $($lspci -n | awk -vclass=$req_class '$2 == class":" {split($3, p, ":"); printf("0x0000%s 0x0000%s\n", p[1], p[2])}')
+ 
+ 	local PCI_ANY_ID=0x0000ffff pci_module vendor device subvendor subdevice class class_mask driver_data
+ 	while read pci_module vendor device subvendor subdevice class class_mask driver_data; do
++		# match class
++		[ "$(($req_class & $class_mask))" = "$class" ] || continue
+ 		# match vendor
+ 		[ "$1" = "$vendor" ] || continue
+ 		# match device, allow PCI_ANY_ID

================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.178 packages/geninitrd/geninitrd.spec:2.179
--- packages/geninitrd/geninitrd.spec:2.178	Fri Mar  4 10:24:56 2011
+++ packages/geninitrd/geninitrd.spec	Sun Mar  6 17:15:17 2011
@@ -9,7 +9,7 @@
 Name:		geninitrd
 Version:	10000.32
 # leave rel 1 for ac
-Release:	4
+Release:	5
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
@@ -125,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 2.179  2011/03/06 16:15:17  arekm
+- rel 4; fix mod-sata finding too much bug
+
 Revision 2.178  2011/03/04 09:24:56  arekm
 - rel 4; fallback to ls bug fixed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd-svn.patch?r1=2.2&r2=2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.178&r2=2.179&f=u