[Lunar-commits] <moonbase> openafs, openafs-driver: Patch to build with kernel 2.6.24

[Stefan Wold]

commit a1556ac5f5f6cbb75f468e0bdc45407bf167882f
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Wed Feb 13 08:09:56 2008 +0100

    openafs, openafs-driver: Patch to build with kernel 2.6.24
---
 filesys/openafs/BUILD         |   15 ++++++++-------
 filesys/openafs/DETAILS       |    5 ++++-
 kernel/openafs-driver/BUILD   |   16 +++++++++++-----
 kernel/openafs-driver/DETAILS |    5 ++++-
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/filesys/openafs/BUILD b/filesys/openafs/BUILD
index 9206169..b46daa6 100644
--- a/filesys/openafs/BUILD
+++ b/filesys/openafs/BUILD
@@ -2,17 +2,18 @@
   patch_it $SOURCE4 1   &&
   patch_it $SOURCE5 1   &&
   patch_it $SOURCE6 0   &&
+  patch_it $SOURCE7 1   &&
 
-  ./regen.sh            && 
+  ./regen.sh            &&
 
   case `uname -r` in
-    2.6.*) 
+    2.6.*)
       kv="26"
       ;;
-    2.4.*) 
+    2.4.*)
       kv="24"
       ;;
-    *) 
+    *)
       message "Unsupported kernel version!"
       exit -1
       ;;
@@ -46,11 +47,11 @@
                 $OPTS                           &&
   make all_nolibafs                             &&
   prepare_install                               &&
-  
+
   if [ ! -d /etc/openafs ]; then
       mkdir -p /etc/openafs/server
   fi &&
-  
+
   make install_nolibafs                         &&
 
   # Creating needed dirs if not existing
@@ -87,7 +88,7 @@
   if [ ! -f /etc/openafs/cacheinfo ]; then
       echo "/afs:/var/cache/openafs:200000" > /etc/openafs/cacheinfo
   fi
-  
+
   # Copy conf and rc files
   sedit "s;^OPTIONS=.*;OPTIONS=\"-nosettime -fakestat\";" $SOURCE_DIRECTORY/src/afsd/afs.conf.linux &&
   if [ ! -f /etc/config.d/afs ]; then
diff --git a/filesys/openafs/DETAILS b/filesys/openafs/DETAILS
index bca45af..08b1cc5 100644
--- a/filesys/openafs/DETAILS
+++ b/filesys/openafs/DETAILS
@@ -6,20 +6,23 @@
        SOURCE4=openafs-1.4.1-rename_pagsh.patch
        SOURCE5=openafs-1.4.5-rename_kpasswd.patch
        SOURCE6=openafs-1.4.4-fixes.patch
+       SOURCE7=openafs-1.4.6-kernel-2.6.24-fixes.patch
     SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION/
    SOURCE2_URL=http://grand.central.org/dl/cellservdb/
    SOURCE3_URL=$PATCH_URL
    SOURCE4_URL=$PATCH_URL
    SOURCE5_URL=$PATCH_URL
    SOURCE6_URL=$PATCH_URL
+   SOURCE7_URL=$PATCH_URL
     SOURCE_VFY=sha1:39489babe20c42c16ea8f11457de423b2bcca009
    SOURCE3_VFY=sha1:5532084c54a79f77807ee8ae3cb09018b3e74c12
    SOURCE4_VFY=sha1:401b3ada4f9a2a60cd0f6ac60f7107f1fdca0638
    SOURCE5_VFY=sha1:d0e58c3e073d02a66e2fcb7eab322f1b224223dc
    SOURCE6_VFY=sha1:3a24d608b86bcf8155ef67a403c2bc831a0f9f52
+   SOURCE7_VFY=sha1:9161f2c6102d7015f5bbe89336901a90fdf8d918
       WEB_SITE=http://www.openafs.org/
        ENTERED=20031216
-       UPDATED=20071227
+       UPDATED=20080213
     MAINTAINER="ratler at lunar-linux.org"
          SHORT="A distributed filesystem"
 PSAFE=no
diff --git a/kernel/openafs-driver/BUILD b/kernel/openafs-driver/BUILD
index 8aef0b0..5b06ddb 100644
--- a/kernel/openafs-driver/BUILD
+++ b/kernel/openafs-driver/BUILD
@@ -1,13 +1,19 @@
 (
+  # This is needed or a test will fail
+  export EXTRA_FLAGS="$CFLAGS"
+  unset CFLAGS
+
+  patch_it $SOURCE2 1 &&
+
   ./regen.sh &&
   case `uname -r` in
-    2.6.*) 
+    2.6.*)
       kv="26"
       ;;
-    2.4.*) 
+    2.4.*)
       kv="24"
       ;;
-    *) 
+    *)
       message "Unsupported kernel version!"
       exit -1
       ;;
@@ -24,7 +30,7 @@
       OPTS+=" --with-afs-sysname=`arch`_linux${kv}"
       ;;
   esac &&
-   
+
   OPTS="$OPTS --with-linux-kernel-headers=/usr/src/linux"
 
   ./configure   --prefix=/usr                   \
@@ -37,4 +43,4 @@
   prepare_install
 
 ) > $C_FIFO 2>&1
-  
+
diff --git a/kernel/openafs-driver/DETAILS b/kernel/openafs-driver/DETAILS
index e63b08f..236c043 100644
--- a/kernel/openafs-driver/DETAILS
+++ b/kernel/openafs-driver/DETAILS
@@ -1,12 +1,15 @@
           MODULE=openafs-driver
          VERSION=1.4.6
           SOURCE=openafs-$VERSION-src.tar.bz2
+         SOURCE2=openafs-1.4.6-kernel-2.6.24-fixes.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openafs-$VERSION
       SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:39489babe20c42c16ea8f11457de423b2bcca009
+     SOURCE2_VFY=sha1:9161f2c6102d7015f5bbe89336901a90fdf8d918
         WEB_SITE=http://www.openafs.org/
          ENTERED=20031216
-         UPDATED=20071227
+         UPDATED=20080213
       MAINTAINER="ratler at lunar-linux.org"
            SHORT="OpenAFS kernel module"
 PROFILE="yes"