[Pkg-mol-commits] r57 - in mol/trunk/debian: . patches

[Gaudenz Steinlin]

Author: gaudenz
Date: 2006-09-26 21:53:01 +0000 (Tue, 26 Sep 2006)
New Revision: 57

Added:
   mol/trunk/debian/patches/0.9.71~pre9_ablk.dpatch
Modified:
   mol/trunk/debian/changelog
   mol/trunk/debian/patches/00list
Log:
revert changes in 0.9.71~pre9 to ablk.c as they cause a hang on boot


Modified: mol/trunk/debian/changelog
===================================================================
--- mol/trunk/debian/changelog	2006-09-26 00:57:34 UTC (rev 56)
+++ mol/trunk/debian/changelog	2006-09-26 21:53:01 UTC (rev 57)
@@ -29,6 +29,7 @@
   * change Suggests of mol-modules-source from kernel-* to linux-*
   * correct documentation in mol-modules-source.README.Debian
   * document new upstream location in copyright
+  * revert changes in 0.9.71~pre9 to ablk.c as they cause a hang on boot
 
   [ Aurélien GÉRÔME ]
 
@@ -39,7 +40,7 @@
   * Add Swedish debconf templates translation (sv.po), thanks to Daniel
     Nylander <yeager at lidkoping.net>. (Closes: #340974)
 
- -- Aurélien GÉRÔME <ag at roxor.cx>  Tue, 26 Sep 2006 02:46:43 +0200
+ -- Gaudenz Steinlin <gaudenz at debian.org>  Tue, 26 Sep 2006 23:50:34 +0200
 
 mol (0.9.70-20.1) unstable; urgency=low
 

Added: mol/trunk/debian/patches/0.9.71~pre9_ablk.dpatch
===================================================================
--- mol/trunk/debian/patches/0.9.71~pre9_ablk.dpatch	                        (rev 0)
+++ mol/trunk/debian/patches/0.9.71~pre9_ablk.dpatch	2006-09-26 21:53:01 UTC (rev 57)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0.9.71~pre9_ablk.dpatch by  <gaudenz at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: revert non working change to ablk.c
+
+ at DPATCH@
+diff -urNad mol-0.9.71~pre9~/src/drivers/disk/ablk.c mol-0.9.71~pre9/src/drivers/disk/ablk.c
+--- mol-0.9.71~pre9~/src/drivers/disk/ablk.c	2006-09-05 05:18:11.000000000 +0200
++++ mol-0.9.71~pre9/src/drivers/disk/ablk.c	2006-09-26 23:29:01.000000000 +0200
+@@ -115,11 +115,6 @@
+ 	struct iovec vec[MAX_IOVEC];
+ 	int n, count;
+ 
+-	union {
+-		void * v;
+-		char * c;
+-	} iovec_pun;
+-
+ 	n = count = 0;
+ 
+ 	for( ;; ) {
+@@ -167,8 +162,7 @@
+ 		/* process scatter & gather bufs */
+ 		if( (f & ABLK_SG_BUF) ) {
+ 			ablk_sg_t *p = (ablk_sg_t*)r;
+-			iovec_pun.v = vec[n].iov_base;
+-			if( mphys_to_lvptr( p->buf, (char **)&iovec_pun.c ) ) {
++			if( mphys_to_lvptr( p->buf, (char**)&vec[n].iov_base ) ) {
+ 				printm("ablk: bogus sg-buf");
+ 				goto error;
+ 			}


Property changes on: mol/trunk/debian/patches/0.9.71~pre9_ablk.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mol/trunk/debian/patches/00list
===================================================================
--- mol/trunk/debian/patches/00list	2006-09-26 00:57:34 UTC (rev 56)
+++ mol/trunk/debian/patches/00list	2006-09-26 21:53:01 UTC (rev 57)
@@ -3,3 +3,4 @@
 modload
 if-tap
 Makefile_kmod
+0.9.71~pre9_ablk