[Lunar-commits] r15700 - moonbase/trunk/filesys/raidtools

[Jaime Buffery]

Author: nestu
Date: 2005-07-12 13:48:52 +0000 (Tue, 12 Jul 2005)
New Revision: 15700

Modified:
   moonbase/trunk/filesys/raidtools/BUILD
   moonbase/trunk/filesys/raidtools/DETAILS
Log:
getpageshift func in raidlib.c was redefining a func found /usr/include/asm/page.h, so the patch renames the func in raidlib.c and the only call to it, that happens to be in the same file "radilib.c"

Modified: moonbase/trunk/filesys/raidtools/BUILD
===================================================================
--- moonbase/trunk/filesys/raidtools/BUILD	2005-07-12 10:53:34 UTC (rev 15699)
+++ moonbase/trunk/filesys/raidtools/BUILD	2005-07-12 13:48:52 UTC (rev 15700)
@@ -1,6 +1,7 @@
 (
 
-   patch_it  $SOURCE_CACHE/$SOURCE1 1
+   patch_it  $SOURCE2 1
+   patch_it  $SOURCE3 0
    
    ./configure $OPTS &&
    make &&

Modified: moonbase/trunk/filesys/raidtools/DETAILS
===================================================================
--- moonbase/trunk/filesys/raidtools/DETAILS	2005-07-12 10:53:34 UTC (rev 15699)
+++ moonbase/trunk/filesys/raidtools/DETAILS	2005-07-12 13:48:52 UTC (rev 15700)
@@ -1,14 +1,18 @@
           MODULE=raidtools
          VERSION=1.00.3
           SOURCE=$MODULE-$VERSION.tar.gz
-         SOURCE1=$MODULE-$VERSION--gcc-3.3--fix1.patch.bz2
-   SOURCE_URL[0]=http://people.redhat.com/mingo/raidtools/
-  SOURCE1_URL[0]=$PATCH_URL/
+         SOURCE2=$MODULE-$VERSION--gcc-3.3--fix1.patch.bz2
+         SOURCE3=raidtools_getpageshift_collision_with_asm_headers_fix.patch
+      SOURCE_URL=http://people.redhat.com/mingo/raidtools/
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE3_URL=$PATCH_URL/
+      SOURCE_VFY=sha1:db6a05e371622e4b83e054355d906b0a48e76844
+     SOURCE2_VFY=sha1:049497690c5cd0911cc5697d442fa53f763c8eb5
+     SOURCE3_VFY=sha1:c47320eed1e593b57c8f378c9bafdcfa0a65472b
         WEB_SITE=http://unthought.net/Software-RAID.HOWTO/
          ENTERED=20011218
          UPDATED=20030322
-           SHORT="raidtools package"
-			  
+           SHORT="raidtools package"			  
 cat << EOF
 raidtools package, tools for software RAID
 EOF